dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(bug 7851) Implement mediawiki.page.patrol.ajax"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderWikiModule.php
diff --git
a/includes/resourceloader/ResourceLoaderWikiModule.php
b/includes/resourceloader/ResourceLoaderWikiModule.php
index
28c3426
..
1e61a3e
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/
includes/resourceloader/ResourceLoaderWikiModule.php
@@
-77,10
+77,16
@@
abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
}
$content = $revision->getContent( Revision::RAW );
}
$content = $revision->getContent( Revision::RAW );
+
+ if ( !$content ) {
+ wfDebug( __METHOD__ . "failed to load content of JS/CSS page!\n" );
+ return null;
+ }
+
$model = $content->getModel();
if ( $model !== CONTENT_MODEL_CSS && $model !== CONTENT_MODEL_JAVASCRIPT ) {
$model = $content->getModel();
if ( $model !== CONTENT_MODEL_CSS && $model !== CONTENT_MODEL_JAVASCRIPT ) {
- wfDebug( __METHOD__ . "bad content model
#
$model for JS/CSS page!\n" );
+ wfDebug( __METHOD__ . "bad content model $model for JS/CSS page!\n" );
return null;
}
return null;
}