http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71773
Revision: 71773
Author: tomasz
Date: 2010-08-26 23:53:08 +0000 (Thu, 26 Aug 2010)
Log Message:
-----------
Picking up changes from r71098
Modified Paths:
--------------
branches/wmf/1.16wmf4/extensions/CentralNotice/TemplatePager.php
branches/wmf/1.16wmf4/includes/Pager.php
Property Changed:
----------------
branches/wmf/1.16wmf4/extensions/CentralNotice/
branches/wmf/1.16wmf4/includes/
branches/wmf/1.16wmf4/includes/Article.php
branches/wmf/1.16wmf4/includes/ChangesList.php
branches/wmf/1.16wmf4/includes/ConfEditor.php
branches/wmf/1.16wmf4/includes/DefaultSettings.php
branches/wmf/1.16wmf4/includes/EditPage.php
branches/wmf/1.16wmf4/includes/HTMLForm.php
branches/wmf/1.16wmf4/includes/HistoryPage.php
branches/wmf/1.16wmf4/includes/Html.php
branches/wmf/1.16wmf4/includes/HttpFunctions.php
branches/wmf/1.16wmf4/includes/LocalisationCache.php
branches/wmf/1.16wmf4/includes/LogEventsList.php
branches/wmf/1.16wmf4/includes/OutputPage.php
branches/wmf/1.16wmf4/includes/Preferences.php
branches/wmf/1.16wmf4/includes/Sanitizer.php
branches/wmf/1.16wmf4/includes/UserMailer.php
branches/wmf/1.16wmf4/includes/api/
branches/wmf/1.16wmf4/includes/api/ApiBase.php
branches/wmf/1.16wmf4/includes/api/ApiLogin.php
branches/wmf/1.16wmf4/includes/api/ApiQueryAllUsers.php
branches/wmf/1.16wmf4/includes/diff/
branches/wmf/1.16wmf4/includes/diff/DifferenceInterface.php
branches/wmf/1.16wmf4/includes/filerepo/
branches/wmf/1.16wmf4/includes/json/Services_JSON.php
branches/wmf/1.16wmf4/includes/media/
branches/wmf/1.16wmf4/includes/media/Bitmap.php
branches/wmf/1.16wmf4/includes/parser/
branches/wmf/1.16wmf4/includes/specials/
branches/wmf/1.16wmf4/includes/specials/SpecialAllmessages.php
branches/wmf/1.16wmf4/includes/specials/SpecialRevisiondelete.php
branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php
branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf-deployment/extensions/CentralNotice:60970
/trunk/extensions/CentralNotice:62820-67552,67557,67559-71720,71725-71731,71734-71739
/trunk/phase3/extensions/CentralNotice:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
+ /branches/wmf-deployment/extensions/CentralNotice:60970
/trunk/extensions/CentralNotice:62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753
/trunk/phase3/extensions/CentralNotice:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
Modified: branches/wmf/1.16wmf4/extensions/CentralNotice/TemplatePager.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/TemplatePager.php
2010-08-26 23:47:11 UTC (rev 71772)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/TemplatePager.php
2010-08-26 23:53:08 UTC (rev 71773)
@@ -30,7 +30,7 @@
* Sort the banner list by tmp_id
*/
function getIndexField() {
- return 'tmp_id';
+ return 'cn_templates.tmp_id';
}
/**
Property changes on: branches/wmf/1.16wmf4/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
+ /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/Article.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381,60970
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64934
+ /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381,60970
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64934,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589,60970
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589,60970
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf-deployment/includes/ConfEditor.php:60970
/trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901
+ /branches/wmf-deployment/includes/ConfEditor.php:60970
/trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/DefaultSettings.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/sqlite/includes/DefaultSettings.php:58211-58321
/branches/wmf-deployment/includes/DefaultSettings.php:53381,60970
/trunk/phase3/includes/DefaultSettings.php:63549,63764,63897-63901,64692,64851,64856,64876,64892,64918,64948,65387,65391,65555,65590,65965,66151,66158,66614
+ /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/sqlite/includes/DefaultSettings.php:58211-58321
/branches/wmf-deployment/includes/DefaultSettings.php:53381,60970
/trunk/phase3/includes/DefaultSettings.php:63549,63764,63897-63901,64692,64851,64856,64876,64892,64918,64948,65387,65391,65555,65590,65965,66151,66158,66614,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/EditPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/sqlite/includes/EditPage.php:58211-58321
/branches/wmf-deployment/includes/EditPage.php:53381,60970
/trunk/phase3/includes/EditPage.php:63549,63764,63897-63901,64881
+ /branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/sqlite/includes/EditPage.php:58211-58321
/branches/wmf-deployment/includes/EditPage.php:53381,60970
/trunk/phase3/includes/EditPage.php:63549,63764,63897-63901,64881,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/HTMLForm.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/HTMLForm.php:51646
/branches/sqlite/includes/HTMLForm.php:58211-58321
/branches/wmf/1.16wmf4/includes/HTMLForm.php:68909
/branches/wmf-deployment/includes/HTMLForm.php:53381,60970
/trunk/phase3/includes/HTMLForm.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68909
+ /branches/REL1_15/phase3/includes/HTMLForm.php:51646
/branches/sqlite/includes/HTMLForm.php:58211-58321
/branches/wmf/1.16wmf4/includes/HTMLForm.php:68909
/branches/wmf-deployment/includes/HTMLForm.php:53381,60970
/trunk/phase3/includes/HTMLForm.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68909,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/wmf-deployment/includes/HistoryPage.php:60970
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/wmf-deployment/includes/HistoryPage.php:60970
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/Html.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Html.php:51646
/branches/sqlite/includes/Html.php:58211-58321
/branches/wmf-deployment/includes/Html.php:53381,60970
/trunk/phase3/includes/Html.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,67283,67869
+ /branches/REL1_15/phase3/includes/Html.php:51646
/branches/sqlite/includes/Html.php:58211-58321
/branches/wmf-deployment/includes/Html.php:53381,60970
/trunk/phase3/includes/Html.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,67283,67869,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/HttpFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/HttpFunctions.php:51646
/branches/sqlite/includes/HttpFunctions.php:58211-58321
/branches/wmf-deployment/includes/HttpFunctions.php:53381,60970
/trunk/phase3/includes/HttpFunctions.php:63549,63764,63897-63901,65529,65532
+ /branches/REL1_15/phase3/includes/HttpFunctions.php:51646
/branches/sqlite/includes/HttpFunctions.php:58211-58321
/branches/wmf-deployment/includes/HttpFunctions.php:53381,60970
/trunk/phase3/includes/HttpFunctions.php:63549,63764,63897-63901,65529,65532,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/LocalisationCache.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381,60970
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381,60970
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/LogEventsList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/LogEventsList.php:51646
/branches/sqlite/includes/LogEventsList.php:58211-58321
/branches/wmf-deployment/includes/LogEventsList.php:53381,60970
/trunk/phase3/includes/LogEventsList.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,66793
+ /branches/REL1_15/phase3/includes/LogEventsList.php:51646
/branches/sqlite/includes/LogEventsList.php:58211-58321
/branches/wmf-deployment/includes/LogEventsList.php:53381,60970
/trunk/phase3/includes/LogEventsList.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,66793,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468,60970
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901,64851,64856,64876,64892,64918
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468,60970
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901,64851,64856,64876,64892,64918,71059,71098
Modified: branches/wmf/1.16wmf4/includes/Pager.php
===================================================================
--- branches/wmf/1.16wmf4/includes/Pager.php 2010-08-26 23:47:11 UTC (rev
71772)
+++ branches/wmf/1.16wmf4/includes/Pager.php 2010-08-26 23:53:08 UTC (rev
71773)
@@ -190,8 +190,12 @@
function extractResultInfo( $offset, $limit, ResultWrapper $res ) {
$numRows = $res->numRows();
if ( $numRows ) {
+ # Remove any table prefix from index field
+ $parts = explode( '.', $this->mIndexField );
+ $indexColumn = end( $parts );
+
$row = $res->fetchRow();
- $firstIndex = $row[$this->mIndexField];
+ $firstIndex = $row[$indexColumn];
# Discard the extra result row if there is one
if ( $numRows > $this->mLimit && $numRows > 1 ) {
@@ -201,7 +205,7 @@
$this->mPastTheEndIndex =
$this->mPastTheEndRow->$indexField;
$res->seek( $numRows - 2 );
$row = $res->fetchRow();
- $lastIndex = $row[$this->mIndexField];
+ $lastIndex = $row[$indexColumn];
} else {
$this->mPastTheEndRow = null;
# Setting indexes to an empty string means that
they will be
@@ -211,7 +215,7 @@
$this->mPastTheEndIndex = '';
$res->seek( $numRows - 1 );
$row = $res->fetchRow();
- $lastIndex = $row[$this->mIndexField];
+ $lastIndex = $row[$indexColumn];
}
} else {
$firstIndex = '';
Property changes on: branches/wmf/1.16wmf4/includes/Preferences.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Preferences.php:51646
/branches/sqlite/includes/Preferences.php:58211-58321
/branches/wmf-deployment/includes/Preferences.php:53381,60970
/trunk/phase3/includes/Preferences.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68079,68105,68224,68677
+ /branches/REL1_15/phase3/includes/Preferences.php:51646
/branches/sqlite/includes/Preferences.php:58211-58321
/branches/wmf-deployment/includes/Preferences.php:53381,60970
/trunk/phase3/includes/Preferences.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68079,68105,68224,68677,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/Sanitizer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Sanitizer.php:51646
/branches/sqlite/includes/Sanitizer.php:58211-58321
/branches/wmf-deployment/includes/Sanitizer.php:53381,60970
/trunk/phase3/includes/Sanitizer.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,66990
+ /branches/REL1_15/phase3/includes/Sanitizer.php:51646
/branches/sqlite/includes/Sanitizer.php:58211-58321
/branches/wmf-deployment/includes/Sanitizer.php:53381,60970
/trunk/phase3/includes/Sanitizer.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,66990,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/UserMailer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/UserMailer.php:51646
/branches/sqlite/includes/UserMailer.php:58211-58321
/branches/wmf-deployment/includes/UserMailer.php:53381,60970
/trunk/phase3/includes/UserMailer.php:63549,63764,63897-63901,64851,64856,64876,64892,64918,65027
+ /branches/REL1_15/phase3/includes/UserMailer.php:51646
/branches/sqlite/includes/UserMailer.php:58211-58321
/branches/wmf-deployment/includes/UserMailer.php:53381,60970
/trunk/phase3/includes/UserMailer.php:63549,63764,63897-63901,64851,64856,64876,64892,64918,65027,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:69932
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970
/trunk/phase3/includes/api:63549,63764,63897-63901,64454,66486,69339,69347,69350,69369,69379,69776,69931,70078
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:69932
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970
/trunk/phase3/includes/api:63549,63764,63897-63901,64454,66486,69339,69347,69350,69369,69379,69776,69931,70078,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api/ApiBase.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiBase.php:51646
/branches/sqlite/includes/api/ApiBase.php:58211-58321
/branches/wmf-deployment/includes/api/ApiBase.php:53381,59952,60970
/trunk/phase3/includes/api/ApiBase.php:63549,63764,63897-63901,64454,66486,70062,70078
+ /branches/REL1_15/phase3/includes/api/ApiBase.php:51646
/branches/sqlite/includes/api/ApiBase.php:58211-58321
/branches/wmf-deployment/includes/api/ApiBase.php:53381,59952,60970
/trunk/phase3/includes/api/ApiBase.php:63549,63764,63897-63901,64454,66486,70062,70078,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api/ApiLogin.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiLogin.php:51646
/branches/REL1_16/phase3/includes/api/ApiLogin.php:69932
/branches/sqlite/includes/api/ApiLogin.php:58211-58321
/branches/wmf-deployment/includes/api/ApiLogin.php:53381,59952,60970
/trunk/phase3/includes/api/ApiLogin.php:63549,63764,63897-63901,64454,64694,66486,70078
+ /branches/REL1_15/phase3/includes/api/ApiLogin.php:51646
/branches/REL1_16/phase3/includes/api/ApiLogin.php:69932
/branches/sqlite/includes/api/ApiLogin.php:58211-58321
/branches/wmf-deployment/includes/api/ApiLogin.php:53381,59952,60970
/trunk/phase3/includes/api/ApiLogin.php:63549,63764,63897-63901,64454,64694,66486,70078,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api/ApiQueryAllUsers.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/phase3/includes/api/ApiQueryAllUsers.php:69339,69347,69350,69369,69379,69776,69931,70078
+
/trunk/phase3/includes/api/ApiQueryAllUsers.php:69339,69347,69350,69369,69379,69776,69931,70078,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/diff
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/diff:51646
/branches/sqlite/includes/diff:58211-58321
/branches/wmf-deployment/includes/diff:53381,60970
/trunk/phase3/includes/diff:63549,63764,63897-63901,64802
+ /branches/REL1_15/phase3/includes/diff:51646
/branches/sqlite/includes/diff:58211-58321
/branches/wmf-deployment/includes/diff:53381,60970
/trunk/phase3/includes/diff:63549,63764,63897-63901,64802,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/diff/DifferenceInterface.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/diff/DifferenceInterface.php:51646
/branches/sqlite/includes/diff/DifferenceInterface.php:58211-58321
/branches/wmf-deployment/includes/diff/DifferenceInterface.php:53381,60970
/trunk/phase3/includes/diff/DifferenceInterface.php:63549,63764,63897-63901,64802,69191,69204
+ /branches/REL1_15/phase3/includes/diff/DifferenceInterface.php:51646
/branches/sqlite/includes/diff/DifferenceInterface.php:58211-58321
/branches/wmf-deployment/includes/diff/DifferenceInterface.php:53381,60970
/trunk/phase3/includes/diff/DifferenceInterface.php:63549,63764,63897-63901,64802,69191,69204,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/filerepo
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/filerepo:51646
/branches/sqlite/includes/filerepo:58211-58321
/branches/wmf-deployment/includes/filerepo:53381,60970
/trunk/phase3/includes/filerepo:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68409
+ /branches/REL1_15/phase3/includes/filerepo:51646
/branches/sqlite/includes/filerepo:58211-58321
/branches/wmf-deployment/includes/filerepo:53381,60970
/trunk/phase3/includes/filerepo:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68409,71059,71098
Property changes on: branches/wmf/1.16wmf4/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
/branches/wmf-deployment/includes/json/Services_JSON.php:60970
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/branches/wmf-deployment/includes/json/Services_JSON.php:60970
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/media
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/media:51646
/branches/sqlite/includes/media:58211-58321
/branches/wmf-deployment/includes/media:53381,60970
/trunk/phase3/includes/media:63549,63764,63897-63901,64935-64936,64947,65467,68409,68468,68714
+ /branches/REL1_15/phase3/includes/media:51646
/branches/sqlite/includes/media:58211-58321
/branches/wmf-deployment/includes/media:53381,60970
/trunk/phase3/includes/media:63549,63764,63897-63901,64935-64936,64947,65467,68409,68468,68714,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/media/Bitmap.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381,60970
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64691-64692,64932,64935-64936,64947,65401,65467,68409,68468,68714,71546
+ /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381,60970
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64691-64692,64932,64935-64936,64947,65401,65467,68409,68468,68714,71059,71098,71546
Property changes on: branches/wmf/1.16wmf4/includes/parser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/parser:51646
/branches/sqlite/includes/parser:58211-58321
/branches/wmf-deployment/includes/parser:53381,60970
/trunk/phase3/includes/parser:63549,63764,63897-63901,64827
+ /branches/REL1_15/phase3/includes/parser:51646
/branches/sqlite/includes/parser:58211-58321
/branches/wmf-deployment/includes/parser:53381,60970
/trunk/phase3/includes/parser:63549,63764,63897-63901,64827,71059,71098
Property changes on: branches/wmf/1.16wmf4/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,60970
/trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64846,64860,64862
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967,60970
/trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64846,64860,64862,71059,71098
Property changes on:
branches/wmf/1.16wmf4/includes/specials/SpecialAllmessages.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialAllmessages.php:51646
/branches/sqlite/includes/specials/SpecialAllmessages.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialAllmessages.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialAllmessages.php:63045,63047,63549,63764,63897-63901,64180,64846,64860,64862
+ /branches/REL1_15/phase3/includes/specials/SpecialAllmessages.php:51646
/branches/sqlite/includes/specials/SpecialAllmessages.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialAllmessages.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialAllmessages.php:63045,63047,63549,63764,63897-63901,64180,64846,64860,64862,71059,71098
Property changes on:
branches/wmf/1.16wmf4/includes/specials/SpecialRevisiondelete.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialRevisiondelete.php:51646
/branches/sqlite/includes/specials/SpecialRevisiondelete.php:58211-58321
/branches/wmf/1.16wmf4/includes/LogEventsList.php:66793
/branches/wmf-deployment/includes/specials/SpecialRevisiondelete.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialRevisiondelete.php:63045,63047,63549,63764,63897-63901,64846,64860,64862,66793
+ /branches/REL1_15/phase3/includes/specials/SpecialRevisiondelete.php:51646
/branches/sqlite/includes/specials/SpecialRevisiondelete.php:58211-58321
/branches/wmf/1.16wmf4/includes/LogEventsList.php:66793
/branches/wmf-deployment/includes/specials/SpecialRevisiondelete.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialRevisiondelete.php:63045,63047,63549,63764,63897-63901,64846,64860,64862,66793,71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialUpload.php:51646
/branches/sqlite/includes/specials/SpecialUpload.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUpload.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialUpload.php:63045,63047,63549,63764,63897-63901,64846,64860,64862,65029
+ /branches/REL1_15/phase3/includes/specials/SpecialUpload.php:51646
/branches/sqlite/includes/specials/SpecialUpload.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUpload.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialUpload.php:63045,63047,63549,63764,63897-63901,64846,64860,64862,65029,71059,71098
Property changes on:
branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646
/branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901,64837,64846,64860,64862,65760
+ /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646
/branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901,64837,64846,64860,64862,65760,71059,71098
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
