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

Fix strict error in UploadStashFile

Browse source 
Strict standards: Declaration of UploadStashFile::thumbName() should be compatible with that of File::thumbName() in /var/www/wiki/mediawiki/core/includes/upload/UploadStash.php on line 498

Call Stack:
    0.0004     645672   1. {main}() /var/www/wiki/mediawiki/core/index.php:0
    0.0756    5904264   2. MediaWiki->run() /var/www/wiki/mediawiki/core/index.php:59
    0.0756    5904264   3. MediaWiki->main() /var/www/wiki/mediawiki/core/includes/Wiki.php:446
    0.0797    6328272   4. MediaWiki->performRequest() /var/www/wiki/mediawiki/core/includes/Wiki.php:536
    0.0960    7042800   5. SpecialPageFactory::executePath() /var/www/wiki/mediawiki/core/includes/Wiki.php:290
    0.1041    8003528   6. SpecialPage->run() /var/www/wiki/mediawiki/core/includes/SpecialPageFactory.php:494
    0.1041    8003528   7. SpecialSpecialpages->execute() /var/www/wiki/mediawiki/core/includes/SpecialPage.php:611
    0.2082   17300016   8. SpecialSpecialpages->getPageGroups() /var/www/wiki/mediawiki/core/includes/specials/SpecialSpecialpages.php:42
    0.2083   17300016   9. SpecialPageFactory::getUsablePages() /var/www/wiki/mediawiki/core/includes/specials/SpecialSpecialpages.php:54
    0.4498   30176624  10. SpecialPageFactory::getPage() /var/www/wiki/mediawiki/core/includes/SpecialPageFactory.php:372
    0.4527   30373096  11. SpecialUploadStash->__construct() /var/www/wiki/mediawiki/core/includes/SpecialPageFactory.php:344
    0.4861   33604352  12. FileRepo->getUploadStash() /var/www/wiki/mediawiki/core/includes/specials/SpecialUploadStash.php:52
    0.4861   33604832  13. AutoLoader::autoload() /var/www/wiki/mediawiki/core/includes/AutoLoader.php:0
    0.4898   33952264  14. require('/var/www/wiki/mediawiki/core/includes/upload/UploadStash.php') /var/www/wiki/mediawiki/core/includes/AutoLoader.php:1150

Change-Id: Iee2aae16df804f42cbae9c21c870781a08ad3850
This commit is contained in:
Reedy 2012-09-16 18:18:27 +01:00
parent 25a488e6c4
commit be32e26699
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/upload/UploadStash.php
View file

@ -572,9 +572,10 @@ class UploadStashFile extends UnregisteredLocalFile {
* ugly file name.
*
* @param $params Array: handler-specific parameters
* @param $flags integer Bitfield that supports THUMB_* constants
* @return String: base name for URL, like '120px-12345.jpg', or null if there is no handler
*/
function thumbName( $params ) {
function thumbName( $params, $flags = 0 ) {
return $this->generateThumbName( $this->getUrlName(), $params );
}