r81460 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r81459‎ \| r81460 \| r81461 >
Date:	15:32, 3 February 2011
Author:	catrope
Status:	resolved (Comments)
Tags:
Comment:	Applied local patches for new WMF branch
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/docs/export-0.5.xsd (modified) (history) /branches/wmf/1.17wmf1/docs/hooks.txt (modified) (history) /branches/wmf/1.17wmf1/extensions/ArticleAssessmentPilot (modified) (history) /branches/wmf/1.17wmf1/extensions/CategoryTree/CategoryTreeFunctions.php (modified) (history) /branches/wmf/1.17wmf1/extensions/CentralNotice (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/FlaggedRevs (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/LandingCheck (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads (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/LiquidThreads_alpha (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads_alpha/i18n (modified) (history) /branches/wmf/1.17wmf1/extensions/LiquidThreads_alpha/i18n/Lqt.namespaces.php (modified) (history) /branches/wmf/1.17wmf1/extensions/LocalisationUpdate (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/SyntaxHighlight_GeSHi (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/VariablePage (modified) (history) /branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.collapsibleTabs.js (modified) (history) /branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.simpleSearch.js (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/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/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/Interwiki.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/Profiler.php (modified) (history) /branches/wmf/1.17wmf1/includes/Revision.php (modified) (history) /branches/wmf/1.17wmf1/includes/SpecialPage.php (modified) (history) /branches/wmf/1.17wmf1/includes/Title.php (modified) (history) /branches/wmf/1.17wmf1/includes/WatchlistEditor.php (modified) (history) /branches/wmf/1.17wmf1/includes/api (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/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/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/RepoGroup.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/json/Services_JSON.php (modified) (history) /branches/wmf/1.17wmf1/includes/parser/Parser.php (modified) (history) /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoader.php (modified) (history) /branches/wmf/1.17wmf1/includes/specials (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/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/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/jobs-loop.sh (modified) (history) /branches/wmf/1.17wmf1/maintenance/populateRevisionLength.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/math/GNUmakefile (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/thumb.php (modified) (history) /branches/wmf/1.17wmf1/trackback.php (modified) (history)

Follow-up revisions

Revision	Commit summary	Author	Date
r82589	Fix for r81460: botched merge conflict resolution when porting r60970 to here...	tstarling	02:33, 22 February 2011
r83564	Syncing up to head of trunk from r81460	tomasz	02:32, 9 March 2011
r96827	Commit live patch, not sure who wrote it. It fixes a bug from r77266, reappli...	tstarling	08:04, 12 September 2011
r97490	Commenting out r81460, there's too much merge info rubbish and stuff	reedy	13:45, 19 September 2011
r97512	1.18wmf1 Merge r60970, r69199, r77266, r96827 (Some of the revisions from r81...	reedy	16:01, 19 September 2011

Comments

#Comment by Platonides (talk | contribs) 10:28, 22 February 2011

Merges r60970, r67177, r69199, r76243, r77266

#Comment by Reedy (talk | contribs) 15:45, 19 September 2011

Rarrgh. Bad Roan, this is a really noisy merge :(

#Comment by Catrope (talk | contribs) 17:06, 19 September 2011

I'm sorry. If only there were a revision control system that let you rewrite history in such a case, or didn't have a terrible implementation of merging to begin with...

#Comment by Reedy (talk | contribs) 18:12, 19 September 2011

Heh. Well, I know you don't commit this sort of revisions now, or at least, not intentionally

Yay for | ;)

Status & tagging log

10:28, 22 February 2011 Platonides (talk | contribs) changed the status of r81460 [removed: new added: resolved]