Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
wiki.techinc.nl/includes/resourceloader/ResourceLoaderWikiModule.php

159 lines
4.2 KiB
PHP
Raw Normal View History

Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @author Trevor Parscal
* @author Roan Kattouw
*/
defined( 'MEDIAWIKI' ) || die( 1 );
/**
* Abstraction for resource loader modules which pull from wiki pages
*
* Break long lines * For readability, rewrote ResourceLoaderFileModule::readScriptFiles() to use a loop instead of an excessively cute nested array_map() construction. * In ResourceLoaderFileModule, check file_get_contents() result for errors. Golden rule of error checking: always check fopen(). Every call to fopen will fail some day for some user. * In mediaWiki.loader.filter(): broke up a complex multi-line conditional into multiple commented if statements, for readability. * Possessive "its" has no apostrophe.
2010-11-05 06:53:14 +00:00
* This can only be used for wiki pages in the MediaWiki and User namespaces,
Grammar: it's --> its
2010-11-05 07:39:48 +00:00
* because of its dependence on the functionality of
* Break long lines * For readability, rewrote ResourceLoaderFileModule::readScriptFiles() to use a loop instead of an excessively cute nested array_map() construction. * In ResourceLoaderFileModule, check file_get_contents() result for errors. Golden rule of error checking: always check fopen(). Every call to fopen will fail some day for some user. * In mediaWiki.loader.filter(): broke up a complex multi-line conditional into multiple commented if statements, for readability. * Possessive "its" has no apostrophe.
2010-11-05 06:53:14 +00:00
* Title::isValidCssJsSubpage.
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
*/
abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
/* Protected Members */
Follow-up r64670 (bug22929): cleaner implementation of security for script (and potentially CSS) files. ResourceLoader *already* knows where each module has come from, so all we need to do is filter them in OutputPage according to the desired level of 'trustworthiness'. TODO: * Are there instances where we might want to restrict CSS as well as JS? * Would a $wg config option and/or user preference and/or index.php GET parameter to limit inclusion be useful? * Can we deprecate any of the existing $wg config options? * What's going on with the duplicated code between OutputPage and SkinTemplate?
2011-02-04 16:39:17 +00:00
# Origin is user-supplied code
protected $origin = self::ORIGIN_USER_SITEWIDE;
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
// In-object cache for modified time
protected $modifiedTime = array();
/* Abstract Protected Methods */
abstract protected function getPages( ResourceLoaderContext $context );
/* Protected Methods */
Minor documentation tweaks/improvements
2011-02-08 23:09:22 +00:00
/**
* @param $title Title
* @return null|string
*/
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
protected function getContent( $title ) {
if ( $title->getNamespace() === NS_MEDIAWIKI ) {
$dbkey = $title->getDBkey();
return wfEmptyMsg( $dbkey ) ? '' : wfMsgExt( $dbkey, 'content' );
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
if ( !$title->isCssJsSubpage() ) {
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
return null;
}
$revision = Revision::newFromTitle( $title );
if ( !$revision ) {
return null;
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
return $revision->getRawText();
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
/* Methods */
public function getScript( ResourceLoaderContext $context ) {
$scripts = '';
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
foreach ( $this->getPages( $context ) as $titleText => $options ) {
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
if ( $options['type'] !== 'script' ) {
continue;
}
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
$title = Title::newFromText( $titleText );
if ( !$title ) {
continue;
}
$script = $this->getContent( $title );
if ( strval( $script ) !== '' ) {
if ( strpos( $titleText, '*/' ) === false ) {
$scripts .= "/* $titleText */\n";
}
$scripts .= $script . "\n";
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
}
return $scripts;
}
public function getStyles( ResourceLoaderContext $context ) {
Resolves bug #27328 by supporting URL rewriting for CSS that comes from the Wiki, such as user and site scripts.
2011-02-11 22:57:32 +00:00
global $wgScriptPath;
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
$styles = array();
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
foreach ( $this->getPages( $context ) as $titleText => $options ) {
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
if ( $options['type'] !== 'style' ) {
continue;
}
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
$title = Title::newFromText( $titleText );
if ( !$title ) {
continue;
}
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
$media = isset( $options['media'] ) ? $options['media'] : 'all';
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
$style = $this->getContent( $title );
if ( strval( $style ) === '' ) {
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
continue;
}
Moved CSS flipping to occur inside a module - this resolves a bug which occurs when flipping happens AFTER CSSMin::remap embeds a data URI of an un-flipped image.
2010-12-16 19:31:48 +00:00
if ( $this->getFlip( $context ) ) {
$style = CSSJanus::transform( $style, true, false );
}
Resolves bug #27328 by supporting URL rewriting for CSS that comes from the Wiki, such as user and site scripts.
2011-02-11 22:57:32 +00:00
$style = CSSMin::remap( $style, false, $wgScriptPath, true );
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness. * Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object. * In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array. * Fixed MessageBlobStore to store {} for an empty message array instead of []. * In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set. * For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code. * Documented several ResourceLoader static functions. * In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements. * In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it. * wfGetDb -> wfGetDB * Added an extra line break in the startup module output, for readability. * In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
if ( !isset( $styles[$media] ) ) {
$styles[$media] = '';
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
if ( strpos( $titleText, '*/' ) === false ) {
$styles[$media] .= "/* $titleText */\n";
}
$styles[$media] .= $style . "\n";
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
return $styles;
}
public function getModifiedTime( ResourceLoaderContext $context ) {
$hash = $context->getHash();
if ( isset( $this->modifiedTime[$hash] ) ) {
return $this->modifiedTime[$hash];
}
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
$batch = new LinkBatch;
foreach ( $this->getPages( $context ) as $titleText => $options ) {
$batch->addObj( Title::newFromText( $titleText ) );
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
$modifiedTime = 1; // wfTimestamp() interprets 0 as "now"
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
if ( !$batch->isEmpty() ) {
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
$dbr = wfGetDB( DB_SLAVE );
$latest = $dbr->selectField( 'page', 'MAX(page_touched)',
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
$batch->constructSet( 'page', $dbr ),
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
__METHOD__ );
if ( $latest ) {
$modifiedTime = wfTimestamp( TS_UNIX, $latest );
}
}
Fixes for ResourceLoaderWikiModule r72776. No serious bugs found, do not merge before deployment. * Specify page titles as strings instead of split NS/DBK, as suggested by Roan on CR. It seemed sensible to me. * Pass a Title object to getContent() instead of a string, to avoid unnecessary object construction overhead * "*" and "/" are valid title characters. Check module input for JS comment end tokens. * Fixed inappropriate conversion to boolean, when checking result of getContent(). Presumably the idea was to omit empty sections and errors, so that's what I did. Maybe an informative error message would be better in the error case. * Use LinkBatch for selecting multiple page rows instead of Database::makeWhereFrom2d(). * Fixed assignment expression.
2011-02-08 06:34:38 +00:00
$this->modifiedTime[$hash] = $modifiedTime;
return $modifiedTime;
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
2 subclasses of ResourceLoaderWikiModule implement a duplicate version of getFlip. Move it up into ResourceLoaderWikiModule (Almost looks like it could all go into ResourceLoaderModule... But that uses a different version, seemingly, the only one. 3 other subclasses of ResourceLoaderModule implement the same version of getFlip as is moved into a parent class here... Seems daft to have a different version in the base abstract class... Minor oversight?) Some documentation
2011-02-18 00:33:45 +00:00
/**
* @param $context ResourceLoaderContext
* @return bool
*/
public function getFlip( $context ) {
global $wgContLang;
return $wgContLang->getDir() !== $context->getDirection();
}
Part 1 of 2, moving ResourceLoader*Module classes to their own files - this commit copies the ResourceLoaderModules.php file to each of the new files, as to maintain revision history. The next revision will remove non file specific code.
2010-10-19 18:25:42 +00:00
}
Reference in a new issue Copy permalink