From be32e2669987781e66032c33b07deebe216f0f1e Mon Sep 17 00:00:00 2001 From: Reedy Date: Sun, 16 Sep 2012 18:18:27 +0100 Subject: [PATCH] Fix strict error in UploadStashFile 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 --- includes/upload/UploadStash.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php index aa65ffe72d..c7fd23a9d5 100644 --- a/includes/upload/UploadStash.php +++ b/includes/upload/UploadStash.php @@ -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 ); } -- 2.20.1