r95667 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r95666‎ \| r95667 \| r95668 >
Date:	15:37, 29 August 2011
Author:	neilk
Status:	reverted (Comments)
Tags:
Comment:	merge r94966, r95581 into core -- will fix some fatals in prod, such as bug #30505. A very similar fix for a problem with Special:upload was already deployed by atglenn in r95633, this just adds to that
Modified paths:	/branches/wmf/1.17wmf1 (modified) (history) /branches/wmf/1.17wmf1/README (modified) (history) /branches/wmf/1.17wmf1/RELEASE-NOTES (modified) (history) /branches/wmf/1.17wmf1/StartProfiler.php (modified) (history) /branches/wmf/1.17wmf1/api.php (modified) (history) /branches/wmf/1.17wmf1/docs/export-0.5.xsd (modified) (history) /branches/wmf/1.17wmf1/docs/hooks.txt (modified) (history) /branches/wmf/1.17wmf1/extensions/ArticleFeedback (modified) (history) /branches/wmf/1.17wmf1/extensions/ArticleFeedback/api/ApiArticleFeedback.php (modified) (history) /branches/wmf/1.17wmf1/extensions/ArticleFeedback/api/ApiQueryArticleFeedback.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CategoryTree/CategoryTreeFunctions.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralAuth/CentralAuthUser.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.alias.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.db.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.i18n.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.sql (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/README (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/TemplatePager.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/centralnotice.css (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/centralnotice.js (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/collapsed.png (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/patches (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerAllocation.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerController.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerLoader.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialCentralNotice.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialCentralNoticeLogs.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialHideBanners.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialNoticeTemplate.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/tests (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice/uncollapsed.png (modified) (history) /branches/wmf/1.17wmf1/extensions/CodeReview (modified) (history) /branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CodeReview/backend/Subversion.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CodeReview/modules/ext.codereview.tooltips.js (modified) (history) /branches/wmf/1.17wmf1/extensions/ConditionalShowSection (modified) (history) /branches/wmf/1.17wmf1/extensions/ContactPageFundraiser (modified) (history) /branches/wmf/1.17wmf1/extensions/ContributionReporting (modified) (history) /branches/wmf/1.17wmf1/extensions/ContributionReporting/FundraiserStatistics.js (modified) (history) /branches/wmf/1.17wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php (modified) (history) /branches/wmf/1.17wmf1/extensions/ContributionTracking (modified) (history) /branches/wmf/1.17wmf1/extensions/DonationInterface (modified) (history) /branches/wmf/1.17wmf1/extensions/DoubleWiki (modified) (history) /branches/wmf/1.17wmf1/extensions/EmailCapture (modified) (history) /branches/wmf/1.17wmf1/extensions/FlaggedRevs (modified) (history) /branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedArticleView.php (modified) (history) /branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.hooks.php (modified) (history) /branches/wmf/1.17wmf1/extensions/FlaggedRevs/forms/RevisionReviewForm.php (modified) (history) /branches/wmf/1.17wmf1/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh (modified) (history) /branches/wmf/1.17wmf1/extensions/FundraiserPortal (modified) (history) /branches/wmf/1.17wmf1/extensions/Gadgets (modified) (history) /branches/wmf/1.17wmf1/extensions/GoogleNewsSitemap (modified) (history) /branches/wmf/1.17wmf1/extensions/GoogleNewsSitemap/GoogleNewsSitemap.alias.php (modified) (history) /branches/wmf/1.17wmf1/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php (modified) (history) /branches/wmf/1.17wmf1/extensions/LandingCheck (modified) (history) /branches/wmf/1.17wmf1/extensions/LandingCheck/LandingCheck.i18n.php (modified) (history) /branches/wmf/1.17wmf1/extensions/LandingCheck/SpecialLandingCheck.php (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads/classes/Hooks.php (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads/i18n (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads/i18n/Lqt.namespaces.php (modified) (history) /branches/wmf/1.17wmf1/extensions/LocalisationUpdate (modified) (history) /branches/wmf/1.17wmf1/extensions/MobileFrontend (modified) (history) /branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php (modified) (history) /branches/wmf/1.17wmf1/extensions/NewUserMessage (modified) (history) /branches/wmf/1.17wmf1/extensions/Nuke (modified) (history) /branches/wmf/1.17wmf1/extensions/PoolCounter/PoolCounterClient_body.php (modified) (history) /branches/wmf/1.17wmf1/extensions/ProofreadPage/ProofreadPage_body.php (modified) (history) /branches/wmf/1.17wmf1/extensions/SecurePoll (modified) (history) /branches/wmf/1.17wmf1/extensions/StrategyWiki (modified) (history) /branches/wmf/1.17wmf1/extensions/StrategyWiki/ActiveStrategy (modified) (history) /branches/wmf/1.17wmf1/extensions/StringFunctionsEscaped (modified) (history) /branches/wmf/1.17wmf1/extensions/SubPageList3 (modified) (history) /branches/wmf/1.17wmf1/extensions/SubPageList3/SubPageList3.php (modified) (history) /branches/wmf/1.17wmf1/extensions/TrustedXFF (modified) (history) /branches/wmf/1.17wmf1/extensions/TrustedXFF/trusted-hosts.txt (modified) (history) /branches/wmf/1.17wmf1/extensions/UploadWizard (modified) (history) /branches/wmf/1.17wmf1/extensions/UploadWizard/resources/mw.LanguageUpWiz.js (modified) (history) /branches/wmf/1.17wmf1/extensions/UserDailyContribs/api/ApiUserDailyContribs.php (modified) (history) /branches/wmf/1.17wmf1/extensions/VariablePage (modified) (history) /branches/wmf/1.17wmf1/extensions/Vector/Vector.php (modified) (history) /branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.collapsibleTabs.js (modified) (history) /branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.sectionEditLinks.js (modified) (history) /branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.simpleSearch.js (modified) (history) /branches/wmf/1.17wmf1/extensions/WikiEditor (modified) (history) /branches/wmf/1.17wmf1/extensions/WikiEditor/WikiEditor.hooks.php (modified) (history) /branches/wmf/1.17wmf1/extensions/WikimediaMessages (modified) (history) /branches/wmf/1.17wmf1/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php (modified) (history) /branches/wmf/1.17wmf1/img_auth.php (modified) (history) /branches/wmf/1.17wmf1/includes (modified) (history) /branches/wmf/1.17wmf1/includes/Article.php (modified) (history) /branches/wmf/1.17wmf1/includes/AutoLoader.php (modified) (history) /branches/wmf/1.17wmf1/includes/CategoryPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/ChangesList.php (modified) (history) /branches/wmf/1.17wmf1/includes/ConfEditor.php (modified) (history) /branches/wmf/1.17wmf1/includes/DefaultSettings.php (modified) (history) /branches/wmf/1.17wmf1/includes/Defines.php (modified) (history) /branches/wmf/1.17wmf1/includes/EditPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/GlobalFunctions.php (modified) (history) /branches/wmf/1.17wmf1/includes/HTMLForm.php (modified) (history) /branches/wmf/1.17wmf1/includes/HistoryPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/ImagePage.php (modified) (history) /branches/wmf/1.17wmf1/includes/Interwiki.php (modified) (history) /branches/wmf/1.17wmf1/includes/LocalisationCache.php (modified) (history) /branches/wmf/1.17wmf1/includes/MessageBlobStore.php (modified) (history) /branches/wmf/1.17wmf1/includes/MimeMagic.php (modified) (history) /branches/wmf/1.17wmf1/includes/OutputPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/PoolCounter.php (modified) (history) /branches/wmf/1.17wmf1/includes/RawPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/RecentChange.php (modified) (history) /branches/wmf/1.17wmf1/includes/Revision.php (modified) (history) /branches/wmf/1.17wmf1/includes/Skin.php (modified) (history) /branches/wmf/1.17wmf1/includes/SpecialPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/SquidUpdate.php (modified) (history) /branches/wmf/1.17wmf1/includes/Title.php (modified) (history) /branches/wmf/1.17wmf1/includes/User.php (modified) (history) /branches/wmf/1.17wmf1/includes/WatchlistEditor.php (modified) (history) /branches/wmf/1.17wmf1/includes/WebRequest.php (modified) (history) /branches/wmf/1.17wmf1/includes/Wiki.php (modified) (history) /branches/wmf/1.17wmf1/includes/api (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiFormatBase.php (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiOpenSearch.php (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiParse.php (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiQueryCategoryMembers.php (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiQueryImageInfo.php (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiQueryPageProps.php (modified) (history) /branches/wmf/1.17wmf1/includes/api/ApiUpload.php (modified) (history) /branches/wmf/1.17wmf1/includes/db/Database.php (modified) (history) /branches/wmf/1.17wmf1/includes/db/LoadBalancer.php (modified) (history) /branches/wmf/1.17wmf1/includes/diff/DifferenceEngine.php (modified) (history) /branches/wmf/1.17wmf1/includes/extauth/MediaWiki.php (modified) (history) /branches/wmf/1.17wmf1/includes/filerepo/File.php (modified) (history) /branches/wmf/1.17wmf1/includes/filerepo/ForeignAPIFile.php (modified) (history) /branches/wmf/1.17wmf1/includes/filerepo/ForeignDBRepo.php (modified) (history) /branches/wmf/1.17wmf1/includes/filerepo/LocalFile.php (modified) (history) /branches/wmf/1.17wmf1/includes/installer/CoreInstaller.php (modified) (history) /branches/wmf/1.17wmf1/includes/installer/DatabaseInstaller.php (modified) (history) /branches/wmf/1.17wmf1/includes/installer/MysqlUpdater.php (modified) (history) /branches/wmf/1.17wmf1/includes/installer/WebInstallerPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/job/JobQueue.php (modified) (history) /branches/wmf/1.17wmf1/includes/json/Services_JSON.php (modified) (history) /branches/wmf/1.17wmf1/includes/libs/IEUrlExtension.php (modified) (history) /branches/wmf/1.17wmf1/includes/libs/JavaScriptDistiller.php (modified) (history) /branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php (modified) (history) /branches/wmf/1.17wmf1/includes/media/Bitmap.php (modified) (history) /branches/wmf/1.17wmf1/includes/media/Bitmap_ClientOnly.php (modified) (history) /branches/wmf/1.17wmf1/includes/objectcache/SqlBagOStuff.php (modified) (history) /branches/wmf/1.17wmf1/includes/parser/Parser.php (modified) (history) /branches/wmf/1.17wmf1/includes/resourceloader (modified) (history) /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoader.php (modified) (history) /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderModule.php (modified) (history) /branches/wmf/1.17wmf1/includes/revisiondelete/RevisionDelete.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials (modified) (history) /branches/wmf/1.17wmf1/includes/specials/SpecialEmailuser.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials/SpecialPrefixindex.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials/SpecialSearch.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials/SpecialUpload.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials/SpecialUploadStash.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php (modified) (history) /branches/wmf/1.17wmf1/includes/upload/UploadBase.php (modified) (history) /branches/wmf/1.17wmf1/includes/upload/UploadFromFile.php (modified) (history) /branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php (modified) (history) /branches/wmf/1.17wmf1/includes/upload/UploadStash.php (modified) (history) /branches/wmf/1.17wmf1/languages/Language.php (modified) (history) /branches/wmf/1.17wmf1/languages/LanguageConverter.php (modified) (history) /branches/wmf/1.17wmf1/languages/Names.php (modified) (history) /branches/wmf/1.17wmf1/languages/messages (modified) (history) /branches/wmf/1.17wmf1/languages/messages/MessagesEn.php (modified) (history) /branches/wmf/1.17wmf1/load.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/archives (modified) (history) /branches/wmf/1.17wmf1/maintenance/cleanupTable.inc (modified) (history) /branches/wmf/1.17wmf1/maintenance/deleteSelfExternals.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/edit.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/jobs-loop.sh (modified) (history) /branches/wmf/1.17wmf1/maintenance/nextJobDB.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/populateRevisionLength.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/runJobs.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/storage/make-all-blobs (modified) (history) /branches/wmf/1.17wmf1/maintenance/storage/recompressTracked.sh (modified) (history) /branches/wmf/1.17wmf1/maintenance/storage/testRctComplete.php (modified) (history) /branches/wmf/1.17wmf1/maintenance/tables.sql (modified) (history) /branches/wmf/1.17wmf1/maintenance/tests (modified) (history) /branches/wmf/1.17wmf1/maintenance/updateCollation.php (modified) (history) /branches/wmf/1.17wmf1/math/GNUmakefile (modified) (history) /branches/wmf/1.17wmf1/resources/Resources.php (modified) (history) /branches/wmf/1.17wmf1/resources/jquery/jquery.textSelection.js (modified) (history) /branches/wmf/1.17wmf1/resources/mediawiki.util/mediawiki.util.js (modified) (history) /branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js (modified) (history) /branches/wmf/1.17wmf1/skins/Vector.php (modified) (history) /branches/wmf/1.17wmf1/skins/common/edit.js (modified) (history) /branches/wmf/1.17wmf1/skins/common/prefs.js (modified) (history) /branches/wmf/1.17wmf1/skins/common/shared.css (modified) (history) /branches/wmf/1.17wmf1/skins/vector/screen.css (modified) (history) /branches/wmf/1.17wmf1/trackback.php (modified) (history)

Follow-up revisions

Revision	Commit summary	Author	Date
r95672	MFT of r95581, fixes bug#30505	neilk	15:49, 29 August 2011

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r94966	Two bugs:...	raindrift	23:36, 18 August 2011
r95581	UploadFromStash::stashSession returned an object instead of a file key, which...	raindrift	23:17, 26 August 2011
r95633	fix fatal Call to a member function getId() on a non-object	ariel	18:00, 28 August 2011

Comments

#Comment by NeilK (talk | contribs) 15:42, 29 August 2011

ugh, I committed without running my script to clean SVN of its usual completely bogus mergeinfo. Reverting.

Status & tagging log

15:42, 29 August 2011 NeilK (talk | contribs) changed the status of r95667 [removed: new added: reverted]