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 "Revert "Selenium: configuration file for beta cluster""
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderWikiModule.php
diff --git
a/includes/resourceloader/ResourceLoaderWikiModule.php
b/includes/resourceloader/ResourceLoaderWikiModule.php
index
bebc188
..
5b512af
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/
includes/resourceloader/ResourceLoaderWikiModule.php
@@
-29,8
+29,8
@@
use Wikimedia\Rdbms\IDatabase;
* Abstraction for ResourceLoader modules which pull from wiki pages
*
* This can only be used for wiki pages in the MediaWiki and User namespaces,
* Abstraction for ResourceLoader modules which pull from wiki pages
*
* This can only be used for wiki pages in the MediaWiki and User namespaces,
- * because of its dependence on the functionality of Title::is
CssJsSubpage
- * and Title::is
CssOrJs
Page().
+ * because of its dependence on the functionality of Title::is
UserConfigPage()
+ * and Title::is
SiteConfig
Page().
*
* This module supports being used as a placeholder for a module on a remote wiki.
* To do so, getDB() must be overloaded to return a foreign database object that
*
* This module supports being used as a placeholder for a module on a remote wiki.
* To do so, getDB() must be overloaded to return a foreign database object that
@@
-183,12
+183,10
@@
class ResourceLoaderWikiModule extends ResourceLoaderModule {
* @return Content|null
*/
protected function getContentObj( Title $title ) {
* @return Content|null
*/
protected function getContentObj( Title $title ) {
- $revision = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $title->getArticleID(),
- $title->getLatestRevID() );
+ $revision = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $title );
if ( !$revision ) {
return null;
}
if ( !$revision ) {
return null;
}
- $revision->setTitle( $title );
$content = $revision->getContent( Revision::RAW );
if ( !$content ) {
wfDebugLog( 'resourceloader', __METHOD__ . ': failed to load content of JS/CSS page!' );
$content = $revision->getContent( Revision::RAW );
if ( !$content ) {
wfDebugLog( 'resourceloader', __METHOD__ . ': failed to load content of JS/CSS page!' );
@@
-452,7
+450,7
@@
class ResourceLoaderWikiModule extends ResourceLoaderModule {
} elseif ( $new && in_array( $new->getContentFormat(), $formats ) ) {
$purge = true;
} else {
} elseif ( $new && in_array( $new->getContentFormat(), $formats ) ) {
$purge = true;
} else {
- $purge = ( $title->is
CssOrJsPage() || $title->isCssJsSubp
age() );
+ $purge = ( $title->is
SiteConfigPage() || $title->isUserConfigP
age() );
}
if ( $purge ) {
}
if ( $purge ) {