http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74030
Revision: 74030
Author: neilk
Date: 2010-09-30 18:17:34 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
merging changes from 74019-74029 in trunk
Modified Paths:
--------------
branches/uploadwizard/phase3/RELEASE-NOTES
branches/uploadwizard/phase3/includes/GlobalFunctions.php
Property Changed:
----------------
branches/uploadwizard/extensions/
branches/uploadwizard/extensions/ContactPageFundraiser/
branches/uploadwizard/extensions/LocalisationUpdate/
branches/uploadwizard/phase3/
branches/uploadwizard/phase3/COPYING
branches/uploadwizard/phase3/CREDITS
branches/uploadwizard/phase3/FAQ
branches/uploadwizard/phase3/HISTORY
branches/uploadwizard/phase3/INSTALL
branches/uploadwizard/phase3/README
branches/uploadwizard/phase3/RELEASE-NOTES
branches/uploadwizard/phase3/StartProfiler.sample
branches/uploadwizard/phase3/UPGRADE
branches/uploadwizard/phase3/api.php
branches/uploadwizard/phase3/api.php5
branches/uploadwizard/phase3/bin/
branches/uploadwizard/phase3/cache/
branches/uploadwizard/phase3/config/
branches/uploadwizard/phase3/docs/
branches/uploadwizard/phase3/images/
branches/uploadwizard/phase3/img_auth.php
branches/uploadwizard/phase3/img_auth.php5
branches/uploadwizard/phase3/includes/
branches/uploadwizard/phase3/includes/ChangesList.php
branches/uploadwizard/phase3/includes/ConfEditor.php
branches/uploadwizard/phase3/includes/GlobalFunctions.php
branches/uploadwizard/phase3/includes/HistoryPage.php
branches/uploadwizard/phase3/includes/Interwiki.php
branches/uploadwizard/phase3/includes/OutputPage.php
branches/uploadwizard/phase3/includes/ResourceLoader.php
branches/uploadwizard/phase3/includes/Title.php
branches/uploadwizard/phase3/includes/api/
branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php
branches/uploadwizard/phase3/includes/json/Services_JSON.php
branches/uploadwizard/phase3/includes/specials/
branches/uploadwizard/phase3/index.php
branches/uploadwizard/phase3/index.php5
branches/uploadwizard/phase3/languages/
branches/uploadwizard/phase3/load.php
branches/uploadwizard/phase3/load.php5
branches/uploadwizard/phase3/maintenance/
branches/uploadwizard/phase3/maintenance/archives/
branches/uploadwizard/phase3/maintenance/cleanupTable.inc
branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php
branches/uploadwizard/phase3/maintenance/populateRevisionLength.php
branches/uploadwizard/phase3/maintenance/tables.sql
branches/uploadwizard/phase3/maintenance/tests/
branches/uploadwizard/phase3/math/
branches/uploadwizard/phase3/opensearch_desc.php
branches/uploadwizard/phase3/opensearch_desc.php5
branches/uploadwizard/phase3/php5.php5
branches/uploadwizard/phase3/profileinfo.php
branches/uploadwizard/phase3/redirect.php
branches/uploadwizard/phase3/redirect.php5
branches/uploadwizard/phase3/redirect.phtml
branches/uploadwizard/phase3/resources/
branches/uploadwizard/phase3/serialized/
branches/uploadwizard/phase3/skins/
branches/uploadwizard/phase3/thumb.php
branches/uploadwizard/phase3/thumb.php5
branches/uploadwizard/phase3/trackback.php
branches/uploadwizard/phase3/trackback.php5
branches/uploadwizard/phase3/wiki.phtml
Property changes on: branches/uploadwizard/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/extensions:73544-74018
+ /trunk/phase3/extensions:73544-74018,74020-74029
Property changes on: branches/uploadwizard/extensions/ContactPageFundraiser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/branches/wmf/1.16wmf4/extensions/ContactPageFundraiser:67081
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,73544-74018
+ /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/branches/wmf/1.16wmf4/extensions/ContactPageFundraiser:67081
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,73544-74018,74020-74029
Property changes on: branches/uploadwizard/extensions/LocalisationUpdate
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/extensions/LocalisationUpdate:55198,73544-74018
+ /trunk/phase3/extensions/LocalisationUpdate:55198,73544-74018,74020-74029
Property changes on: branches/uploadwizard/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:73549-74018*
+ /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:73549-74018*,74020-74029*
Property changes on: branches/uploadwizard/phase3/COPYING
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/COPYING:51646
/branches/new-installer/phase3/COPYING:43664-66004
/branches/sqlite/COPYING:58211-58321
/trunk/phase3/COPYING:73549-74018
+ /branches/REL1_15/phase3/COPYING:51646
/branches/new-installer/phase3/COPYING:43664-66004
/branches/sqlite/COPYING:58211-58321
/trunk/phase3/COPYING:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/CREDITS
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/CREDITS:51646
/branches/new-installer/phase3/CREDITS:43664-66004
/branches/sqlite/CREDITS:58211-58321
/trunk/phase3/CREDITS:73549-74018
+ /branches/REL1_15/phase3/CREDITS:51646
/branches/new-installer/phase3/CREDITS:43664-66004
/branches/sqlite/CREDITS:58211-58321
/trunk/phase3/CREDITS:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/FAQ
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/FAQ:51646
/branches/new-installer/phase3/FAQ:43664-66004
/branches/sqlite/FAQ:58211-58321
/trunk/phase3/FAQ:73549-74018
+ /branches/REL1_15/phase3/FAQ:51646
/branches/new-installer/phase3/FAQ:43664-66004
/branches/sqlite/FAQ:58211-58321
/trunk/phase3/FAQ:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/HISTORY
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/HISTORY:51646
/branches/new-installer/phase3/HISTORY:43664-66004
/branches/sqlite/HISTORY:58211-58321
/trunk/phase3/HISTORY:73549-74018
+ /branches/REL1_15/phase3/HISTORY:51646
/branches/new-installer/phase3/HISTORY:43664-66004
/branches/sqlite/HISTORY:58211-58321
/trunk/phase3/HISTORY:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/INSTALL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/INSTALL:51646
/branches/new-installer/phase3/INSTALL:43664-66004
/branches/sqlite/INSTALL:58211-58321
/trunk/phase3/INSTALL:73549-74018
+ /branches/REL1_15/phase3/INSTALL:51646
/branches/new-installer/phase3/INSTALL:43664-66004
/branches/sqlite/INSTALL:58211-58321
/trunk/phase3/INSTALL:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/README:51646
/branches/new-installer/phase3/README:43664-66004
/branches/sqlite/README:58211-58321
/trunk/phase3/README:73549-74018
+ /branches/REL1_15/phase3/README:51646
/branches/new-installer/phase3/README:43664-66004
/branches/sqlite/README:58211-58321
/trunk/phase3/README:73549-74018,74020-74029
Modified: branches/uploadwizard/phase3/RELEASE-NOTES
===================================================================
--- branches/uploadwizard/phase3/RELEASE-NOTES 2010-09-30 17:59:13 UTC (rev
74029)
+++ branches/uploadwizard/phase3/RELEASE-NOTES 2010-09-30 18:17:34 UTC (rev
74030)
@@ -341,6 +341,7 @@
* (bug 25292) SkinSubPageSubtitle hook now passes the Skin object as second
parameter
* (bug 25167) Correctly load JS fixes for IE6 (fixing a regression in 1.16)
+* (bug 25367) wfShellExec() is more explicit when failing due to disabled
passthru()
=== API changes in 1.17 ===
* (bug 22738) Allow filtering by action type on query=logevent.
Property changes on: branches/uploadwizard/phase3/RELEASE-NOTES
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/RELEASE-NOTES:73549-74018
+ /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/RELEASE-NOTES:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/StartProfiler.sample
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/StartProfiler.sample:51646
/branches/new-installer/phase3/StartProfiler.sample:43664-66004
/branches/sqlite/StartProfiler.sample:58211-58321
/trunk/phase3/StartProfiler.sample:73549-74018
+ /branches/REL1_15/phase3/StartProfiler.sample:51646
/branches/new-installer/phase3/StartProfiler.sample:43664-66004
/branches/sqlite/StartProfiler.sample:58211-58321
/trunk/phase3/StartProfiler.sample:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/UPGRADE
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/UPGRADE:51646
/branches/new-installer/phase3/UPGRADE:43664-66004
/branches/sqlite/UPGRADE:58211-58321
/trunk/phase3/UPGRADE:73549-74018
+ /branches/REL1_15/phase3/UPGRADE:51646
/branches/new-installer/phase3/UPGRADE:43664-66004
/branches/sqlite/UPGRADE:58211-58321
/trunk/phase3/UPGRADE:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/api.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/api.php:51646
/branches/new-installer/phase3/api.php:43664-66004
/branches/sqlite/api.php:58211-58321
/trunk/phase3/api.php:73549-74018
+ /branches/REL1_15/phase3/api.php:51646
/branches/new-installer/phase3/api.php:43664-66004
/branches/sqlite/api.php:58211-58321
/trunk/phase3/api.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/api.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/api.php5:51646
/branches/new-installer/phase3/api.php5:43664-66004
/branches/sqlite/api.php5:58211-58321
/trunk/phase3/api.php5:73549-74018
+ /branches/REL1_15/phase3/api.php5:51646
/branches/new-installer/phase3/api.php5:43664-66004
/branches/sqlite/api.php5:58211-58321
/trunk/phase3/api.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/bin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/bin:51646
/branches/new-installer/phase3/bin:43664-66004
/branches/sqlite/bin:58211-58321
/trunk/phase3/bin:73549-74018
+ /branches/REL1_15/phase3/bin:51646
/branches/new-installer/phase3/bin:43664-66004
/branches/sqlite/bin:58211-58321
/trunk/phase3/bin:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/cache
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/cache:51646
/branches/new-installer/phase3/cache:43664-66004
/branches/sqlite/cache:58211-58321
/trunk/phase3/cache:73549-74018
+ /branches/REL1_15/phase3/cache:51646
/branches/new-installer/phase3/cache:43664-66004
/branches/sqlite/cache:58211-58321
/trunk/phase3/cache:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/config:51646
/branches/new-installer/phase3/config:43664-66004
/branches/sqlite/config:58211-58321
/trunk/phase3/config:73549-74018
+ /branches/REL1_15/phase3/config:51646
/branches/new-installer/phase3/config:43664-66004
/branches/sqlite/config:58211-58321
/trunk/phase3/config:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/docs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/docs:51646
/branches/new-installer/phase3/docs:43664-66004
/branches/sqlite/docs:58211-58321
/trunk/phase3/docs:73549-74018
+ /branches/REL1_15/phase3/docs:51646
/branches/new-installer/phase3/docs:43664-66004
/branches/sqlite/docs:58211-58321
/trunk/phase3/docs:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/images
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/images:51646
/branches/new-installer/phase3/images:43664-66004
/branches/sqlite/images:58211-58321
/trunk/phase3/images:73549-74018
+ /branches/REL1_15/phase3/images:51646
/branches/new-installer/phase3/images:43664-66004
/branches/sqlite/images:58211-58321
/trunk/phase3/images:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/img_auth.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/img_auth.php:51646
/branches/new-installer/phase3/img_auth.php:43664-66004
/branches/sqlite/img_auth.php:58211-58321
/trunk/phase3/img_auth.php:73549-74018
+ /branches/REL1_15/phase3/img_auth.php:51646
/branches/new-installer/phase3/img_auth.php:43664-66004
/branches/sqlite/img_auth.php:58211-58321
/trunk/phase3/img_auth.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/img_auth.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/img_auth.php5:51646
/branches/new-installer/phase3/img_auth.php5:43664-66004
/branches/sqlite/img_auth.php5:58211-58321
/trunk/phase3/img_auth.php5:73549-74018
+ /branches/REL1_15/phase3/img_auth.php5:51646
/branches/new-installer/phase3/img_auth.php5:43664-66004
/branches/sqlite/img_auth.php5:58211-58321
/trunk/phase3/img_auth.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:73549-74018
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/resourceloader/phase3/includes/ChangesList.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:73549-74018
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/resourceloader/phase3/includes/ChangesList.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/includes/ConfEditor.php:73549-74018
+ /trunk/phase3/includes/ConfEditor.php:73549-74018,74020-74029
Modified: branches/uploadwizard/phase3/includes/GlobalFunctions.php
===================================================================
--- branches/uploadwizard/phase3/includes/GlobalFunctions.php 2010-09-30
17:59:13 UTC (rev 74029)
+++ branches/uploadwizard/phase3/includes/GlobalFunctions.php 2010-09-30
18:17:34 UTC (rev 74030)
@@ -2449,19 +2449,21 @@
$disabled = false;
if( wfIniGetBool( 'safe_mode' ) ) {
wfDebug( "wfShellExec can't run in safe_mode, PHP's
exec functions are too broken.\n" );
- $disabled = true;
+ $disabled = 'safemode';
}
$functions = explode( ',', ini_get( 'disable_functions' ) );
$functions = array_map( 'trim', $functions );
$functions = array_map( 'strtolower', $functions );
if ( in_array( 'passthru', $functions ) ) {
wfDebug( "passthru is in disabled_functions\n" );
- $disabled = true;
+ $disabled = 'passthru';
}
}
if ( $disabled ) {
$retval = 1;
- return 'Unable to run external programs in safe mode.';
+ return $disabled == 'safemode' ?
+ 'Unable to run external programs in safe mode.' :
+ 'Unable to run external programs, passthru() is
disabled.';
}
wfInitShellLocale();
Property changes on: branches/uploadwizard/phase3/includes/GlobalFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646
/branches/new-installer/phase3/includes/GlobalFunctions.php:43664-66004
/branches/resourceloader/phase3/includes/GlobalFunctions.php:71750
/branches/sqlite/includes/GlobalFunctions.php:58211-58321
/branches/wmf-deployment/includes/GlobalFunctions.php:53381
/trunk/phase3/includes/GlobalFunctions.php:73549-74018
+ /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646
/branches/new-installer/phase3/includes/GlobalFunctions.php:43664-66004
/branches/resourceloader/phase3/includes/GlobalFunctions.php:71750
/branches/sqlite/includes/GlobalFunctions.php:58211-58321
/branches/wmf-deployment/includes/GlobalFunctions.php:53381
/trunk/phase3/includes/GlobalFunctions.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/HistoryPage.php:73549-74018
+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/HistoryPage.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/Interwiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Interwiki.php:51646
/branches/iwtransclusion/phase3/includes/Interwiki.php:68170,68448,69480,69541
/branches/new-installer/phase3/includes/Interwiki.php:43664-66004
/branches/sqlite/includes/Interwiki.php:58211-58321
/branches/wmf-deployment/includes/Interwiki.php:53381
/trunk/phase3/includes/Interwiki.php:73549-74018
+ /branches/REL1_15/phase3/includes/Interwiki.php:51646
/branches/iwtransclusion/phase3/includes/Interwiki.php:68170,68448,69480,69541
/branches/new-installer/phase3/includes/Interwiki.php:43664-66004
/branches/sqlite/includes/Interwiki.php:58211-58321
/branches/wmf-deployment/includes/Interwiki.php:53381
/trunk/phase3/includes/Interwiki.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:73549-74018
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/ResourceLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ResourceLoader.php:51646
/branches/new-installer/phase3/includes/ResourceLoader.php:43664-66004
/branches/resourceloader/phase3/includes/ResourceLoader.php:68366-69676,69678-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/includes/ResourceLoader.php:58211-58321
/branches/wmf-deployment/includes/ResourceLoader.php:53381
/trunk/phase3/includes/ResourceLoader.php:73549-74018
+ /branches/REL1_15/phase3/includes/ResourceLoader.php:51646
/branches/new-installer/phase3/includes/ResourceLoader.php:43664-66004
/branches/resourceloader/phase3/includes/ResourceLoader.php:68366-69676,69678-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/includes/ResourceLoader.php:58211-58321
/branches/wmf-deployment/includes/ResourceLoader.php:53381
/trunk/phase3/includes/ResourceLoader.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/Title.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:73549-74018
+ /branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:73549-74018
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:73549-74018,74020-74029
Property changes on:
branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/InstallerDBType.php:51646
/branches/new-installer/phase3/includes/installer/InstallerDBType.php:43664-66004
/branches/sqlite/includes/installer/InstallerDBType.php:58211-58321
/branches/wmf-deployment/includes/installer/InstallerDBType.php:53381
/trunk/phase3/includes/installer/DatabaseInstaller.php:73549-74018
+ /branches/REL1_15/phase3/includes/installer/InstallerDBType.php:51646
/branches/new-installer/phase3/includes/installer/InstallerDBType.php:43664-66004
/branches/sqlite/includes/installer/InstallerDBType.php:58211-58321
/branches/wmf-deployment/includes/installer/InstallerDBType.php:53381
/trunk/phase3/includes/installer/DatabaseInstaller.php:73549-74018,74020-74029
Property changes on:
branches/uploadwizard/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:73549-74018
+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:73549-74018
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/index.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/index.php:51646
/branches/new-installer/phase3/index.php:43664-66004
/branches/sqlite/index.php:58211-58321
/trunk/phase3/index.php:73549-74018
+ /branches/REL1_15/phase3/index.php:51646
/branches/new-installer/phase3/index.php:43664-66004
/branches/sqlite/index.php:58211-58321
/trunk/phase3/index.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/index.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/index.php5:51646
/branches/new-installer/phase3/index.php5:43664-66004
/branches/sqlite/index.php5:58211-58321
/trunk/phase3/index.php5:73549-74018
+ /branches/REL1_15/phase3/index.php5:51646
/branches/new-installer/phase3/index.php5:43664-66004
/branches/sqlite/index.php5:58211-58321
/trunk/phase3/index.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/languages
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/languages:51646
/branches/new-installer/phase3/languages:43664-66004
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:73549-74018
+ /branches/REL1_15/phase3/languages:51646
/branches/new-installer/phase3/languages:43664-66004
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/load.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/load.php:51646
/branches/new-installer/phase3/load.php:43664-66004
/branches/sqlite/load.php:58211-58321
/trunk/phase3/load.php:73549-74018
+ /branches/REL1_15/phase3/load.php:51646
/branches/new-installer/phase3/load.php:43664-66004
/branches/sqlite/load.php:58211-58321
/trunk/phase3/load.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/load.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/load.php5:51646
/branches/new-installer/phase3/load.php5:43664-66004
/branches/sqlite/load.php5:58211-58321
/trunk/phase3/load.php5:73549-74018
+ /branches/REL1_15/phase3/load.php5:51646
/branches/new-installer/phase3/load.php5:43664-66004
/branches/sqlite/load.php5:58211-58321
/trunk/phase3/load.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/maintenance
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance:51646
/branches/new-installer/phase3/maintenance:43664-66004
/branches/sqlite/maintenance:58211-58321
/trunk/phase3/maintenance:73549-74018
+ /branches/REL1_15/phase3/maintenance:51646
/branches/new-installer/phase3/maintenance:43664-66004
/branches/sqlite/maintenance:58211-58321
/trunk/phase3/maintenance:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/maintenance/archives
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/archives:51646
/branches/iwtransclusion/phase3/maintenance/archives:69540
/branches/new-installer/phase3/maintenance/archives:43664-66004
/branches/sqlite/maintenance/archives:58211-58321
/trunk/phase3/maintenance/archives:73549-74018
+ /branches/REL1_15/phase3/maintenance/archives:51646
/branches/iwtransclusion/phase3/maintenance/archives:69540
/branches/new-installer/phase3/maintenance/archives:43664-66004
/branches/sqlite/maintenance/archives:58211-58321
/trunk/phase3/maintenance/archives:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
/trunk/phase3/maintenance/cleanupTable.inc:73549-74018
+ /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
/trunk/phase3/maintenance/cleanupTable.inc:73549-74018,74020-74029
Property changes on:
branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,73549-74018
+ /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,73549-74018,74020-74029
Property changes on:
branches/uploadwizard/phase3/maintenance/populateRevisionLength.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/populateParentId.php:51646
/branches/sqlite/maintenance/populateParentId.php:58211-58321
/trunk/phase3/maintenance/populateRevisionLength.php:73549-74018
+ /branches/REL1_15/phase3/maintenance/populateParentId.php:51646
/branches/sqlite/maintenance/populateParentId.php:58211-58321
/trunk/phase3/maintenance/populateRevisionLength.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/maintenance/tables.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/tables.sql:51646
/branches/iwtransclusion/phase3/maintenance/tables.sql:68448,69480
/branches/new-installer/phase3/maintenance/tables.sql:43664-66004
/branches/resourceloader/phase3/maintenance/tables.sql:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/maintenance/tables.sql:58211-58321
/trunk/phase3/maintenance/tables.sql:73549-74018
+ /branches/REL1_15/phase3/maintenance/tables.sql:51646
/branches/iwtransclusion/phase3/maintenance/tables.sql:68448,69480
/branches/new-installer/phase3/maintenance/tables.sql:43664-66004
/branches/resourceloader/phase3/maintenance/tables.sql:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/maintenance/tables.sql:58211-58321
/trunk/phase3/maintenance/tables.sql:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/maintenance/tests
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/phpunit-restructure/maintenance/tests:72257-72560
/trunk/phase3/maintenance/tests:73549-74018
+ /branches/phpunit-restructure/maintenance/tests:72257-72560
/trunk/phase3/maintenance/tests:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/math
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/math:51646
/branches/new-installer/phase3/math:43664-66004
/branches/sqlite/math:58211-58321
/trunk/phase3/math:73549-74018
+ /branches/REL1_15/phase3/math:51646
/branches/new-installer/phase3/math:43664-66004
/branches/sqlite/math:58211-58321
/trunk/phase3/math:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/opensearch_desc.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/opensearch_desc.php:51646
/branches/new-installer/phase3/opensearch_desc.php:43664-66004
/branches/sqlite/opensearch_desc.php:58211-58321
/trunk/phase3/opensearch_desc.php:73549-74018
+ /branches/REL1_15/phase3/opensearch_desc.php:51646
/branches/new-installer/phase3/opensearch_desc.php:43664-66004
/branches/sqlite/opensearch_desc.php:58211-58321
/trunk/phase3/opensearch_desc.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/opensearch_desc.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/opensearch_desc.php5:51646
/branches/new-installer/phase3/opensearch_desc.php5:43664-66004
/branches/sqlite/opensearch_desc.php5:58211-58321
/trunk/phase3/opensearch_desc.php5:73549-74018
+ /branches/REL1_15/phase3/opensearch_desc.php5:51646
/branches/new-installer/phase3/opensearch_desc.php5:43664-66004
/branches/sqlite/opensearch_desc.php5:58211-58321
/trunk/phase3/opensearch_desc.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/php5.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/php5.php5:51646
/branches/new-installer/phase3/php5.php5:43664-66004
/branches/sqlite/php5.php5:58211-58321
/trunk/phase3/php5.php5:73549-74018
+ /branches/REL1_15/phase3/php5.php5:51646
/branches/new-installer/phase3/php5.php5:43664-66004
/branches/sqlite/php5.php5:58211-58321
/trunk/phase3/php5.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/profileinfo.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/profileinfo.php:51646
/branches/new-installer/phase3/profileinfo.php:43664-66004
/branches/sqlite/profileinfo.php:58211-58321
/trunk/phase3/profileinfo.php:73549-74018
+ /branches/REL1_15/phase3/profileinfo.php:51646
/branches/new-installer/phase3/profileinfo.php:43664-66004
/branches/sqlite/profileinfo.php:58211-58321
/trunk/phase3/profileinfo.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/redirect.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/redirect.php:51646
/branches/new-installer/phase3/redirect.php:43664-66004
/branches/sqlite/redirect.php:58211-58321
/trunk/phase3/redirect.php:73549-74018
+ /branches/REL1_15/phase3/redirect.php:51646
/branches/new-installer/phase3/redirect.php:43664-66004
/branches/sqlite/redirect.php:58211-58321
/trunk/phase3/redirect.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/redirect.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/redirect.php5:51646
/branches/new-installer/phase3/redirect.php5:43664-66004
/branches/sqlite/redirect.php5:58211-58321
/trunk/phase3/redirect.php5:73549-74018
+ /branches/REL1_15/phase3/redirect.php5:51646
/branches/new-installer/phase3/redirect.php5:43664-66004
/branches/sqlite/redirect.php5:58211-58321
/trunk/phase3/redirect.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/redirect.phtml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/redirect.phtml:51646
/branches/new-installer/phase3/redirect.phtml:43664-66004
/branches/sqlite/redirect.phtml:58211-58321
/trunk/phase3/redirect.phtml:73549-74018
+ /branches/REL1_15/phase3/redirect.phtml:51646
/branches/new-installer/phase3/redirect.phtml:43664-66004
/branches/sqlite/redirect.phtml:58211-58321
/trunk/phase3/redirect.phtml:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/resources:51646
/branches/new-installer/phase3/resources:43664-66004
/branches/sqlite/resources:58211-58321
/trunk/phase3/resources:73549-74018
+ /branches/REL1_15/phase3/resources:51646
/branches/new-installer/phase3/resources:43664-66004
/branches/sqlite/resources:58211-58321
/trunk/phase3/resources:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/serialized
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/serialized:51646
/branches/new-installer/phase3/serialized:43664-66004
/branches/sqlite/serialized:58211-58321
/trunk/phase3/serialized:73549-74018
+ /branches/REL1_15/phase3/serialized:51646
/branches/new-installer/phase3/serialized:43664-66004
/branches/sqlite/serialized:58211-58321
/trunk/phase3/serialized:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/skins
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins:51646
/branches/new-installer/phase3/skins:43664-66004
/branches/sqlite/skins:58211-58321
/trunk/phase3/skins:73549-74018
+ /branches/REL1_15/phase3/skins:51646
/branches/new-installer/phase3/skins:43664-66004
/branches/sqlite/skins:58211-58321
/trunk/phase3/skins:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/thumb.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/thumb.php:51646
/branches/new-installer/phase3/thumb.php:43664-66004
/branches/sqlite/thumb.php:58211-58321
/trunk/phase3/thumb.php:73549-74018
+ /branches/REL1_15/phase3/thumb.php:51646
/branches/new-installer/phase3/thumb.php:43664-66004
/branches/sqlite/thumb.php:58211-58321
/trunk/phase3/thumb.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/thumb.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/thumb.php5:51646
/branches/new-installer/phase3/thumb.php5:43664-66004
/branches/sqlite/thumb.php5:58211-58321
/trunk/phase3/thumb.php5:73549-74018
+ /branches/REL1_15/phase3/thumb.php5:51646
/branches/new-installer/phase3/thumb.php5:43664-66004
/branches/sqlite/thumb.php5:58211-58321
/trunk/phase3/thumb.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/trackback.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/trackback.php:51646
/branches/new-installer/phase3/trackback.php:43664-66004
/branches/sqlite/trackback.php:58211-58321
/trunk/phase3/trackback.php:73549-74018
+ /branches/REL1_15/phase3/trackback.php:51646
/branches/new-installer/phase3/trackback.php:43664-66004
/branches/sqlite/trackback.php:58211-58321
/trunk/phase3/trackback.php:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/trackback.php5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/trackback.php5:51646
/branches/new-installer/phase3/trackback.php5:43664-66004
/branches/sqlite/trackback.php5:58211-58321
/trunk/phase3/trackback.php5:73549-74018
+ /branches/REL1_15/phase3/trackback.php5:51646
/branches/new-installer/phase3/trackback.php5:43664-66004
/branches/sqlite/trackback.php5:58211-58321
/trunk/phase3/trackback.php5:73549-74018,74020-74029
Property changes on: branches/uploadwizard/phase3/wiki.phtml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/wiki.phtml:51646
/branches/new-installer/phase3/wiki.phtml:43664-66004
/branches/sqlite/wiki.phtml:58211-58321
/trunk/phase3/wiki.phtml:73549-74018
+ /branches/REL1_15/phase3/wiki.phtml:51646
/branches/new-installer/phase3/wiki.phtml:43664-66004
/branches/sqlite/wiki.phtml:58211-58321
/trunk/phase3/wiki.phtml:73549-74018,74020-74029
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
