https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113235
Revision: 113235
Author: reedy
Date: 2012-03-07 15:14:48 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
MFT r113171, r113195, r113211
Modified Paths:
--------------
branches/REL1_19/phase3/includes/RecentChange.php
branches/REL1_19/phase3/includes/api/ApiBase.php
branches/REL1_19/phase3/includes/filerepo/backend/FileOp.php
Property Changed:
----------------
branches/REL1_19/phase3/
branches/REL1_19/phase3/includes/
branches/REL1_19/phase3/includes/api/
Property changes on: branches/REL1_19/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111380,111427,111478,111571,111574,111580,111597,111658,111673,111695,111697,111795,111809,111832,111881,111920,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112169-112170,112172-112173,112179,112184,112290,112313,112347,112374,112383-112384,112400,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112573,112700,112750,112838,112855,112872-112873,112988,112995,113001,113024,113039,113046,113085,113099,113169
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111380,111427,111478,111571,111574,111580,111597,111658,111673,111695,111697,111795,111809,111832,111881,111920,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112169-112170,112172-112173,112179,112184,112290,112313,112347,112374,112383-112384,112400,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112573,112700,112750,112838,112855,112872-112873,112988,112995,113001,113024,113039,113046,113085,113099,113169,113171,113195,113211
Property changes on: branches/REL1_19/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111380,111427,111571,111574,111597,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112184,112290,112313,112347,112374,112383,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112700,112750,112838,112855,112872-112873,112988,112995,113001,113024,113039,113046,113099,113169
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111380,111427,111571,111574,111597,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112184,112290,112313,112347,112374,112383,112408,112451,112456,112474,112526,112533-112534,112538,112563,112566-112567,112700,112750,112838,112855,112872-112873,112988,112995,113001,113024,113039,113046,113099,113169,113171,113195,113211
Modified: branches/REL1_19/phase3/includes/RecentChange.php
===================================================================
--- branches/REL1_19/phase3/includes/RecentChange.php 2012-03-07 14:30:06 UTC
(rev 113234)
+++ branches/REL1_19/phase3/includes/RecentChange.php 2012-03-07 15:14:48 UTC
(rev 113235)
@@ -166,7 +166,7 @@
* @param $noudp bool
*/
public function save( $noudp = false ) {
- global $wgLocalInterwiki, $wgPutIPinRC;
+ global $wgLocalInterwiki, $wgPutIPinRC, $wgContLang;
$dbw = wfGetDB( DB_MASTER );
if( !is_array($this->mExtra) ) {
@@ -183,6 +183,9 @@
unset( $this->mAttribs['rc_ip'] );
}
+ # Make sure summary is truncated (whole multibyte characters)
+ $this->mAttribs['rc_comment'] = $wgContLang->truncate(
$this->mAttribs['rc_comment'], 255 );
+
# Fixup database timestamps
$this->mAttribs['rc_timestamp'] =
$dbw->timestamp($this->mAttribs['rc_timestamp']);
$this->mAttribs['rc_cur_time'] =
$dbw->timestamp($this->mAttribs['rc_cur_time']);
Property changes on: branches/REL1_19/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/api:100352-107913
/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/1.18wmf1/includes/api:97789,111667
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:111673,112290,112313,112374,112383,112700,112750,112855
+ /branches/JSTesting/includes/api:100352-107913
/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/1.18wmf1/includes/api:97789,111667
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:111673,112290,112313,112374,112383,112700,112750,112855,113211
Modified: branches/REL1_19/phase3/includes/api/ApiBase.php
===================================================================
--- branches/REL1_19/phase3/includes/api/ApiBase.php 2012-03-07 14:30:06 UTC
(rev 113234)
+++ branches/REL1_19/phase3/includes/api/ApiBase.php 2012-03-07 15:14:48 UTC
(rev 113235)
@@ -1269,6 +1269,7 @@
* @return array('code' => code, 'info' => info)
*/
public function parseMsg( $error ) {
+ $error = (array)$error; // It seems strings sometimes make
their way in here
$key = array_shift( $error );
// Check whether the error array was nested
Modified: branches/REL1_19/phase3/includes/filerepo/backend/FileOp.php
===================================================================
--- branches/REL1_19/phase3/includes/filerepo/backend/FileOp.php
2012-03-07 14:30:06 UTC (rev 113234)
+++ branches/REL1_19/phase3/includes/filerepo/backend/FileOp.php
2012-03-07 15:14:48 UTC (rev 113235)
@@ -134,13 +134,12 @@
} else {
$status->success[$index] = false;
++$status->failCount;
- if ( !$ignoreErrors ) {
- // Log remaining ops as failed for
recovery...
- for ( $i = ($index + 1); $i < count(
$performOps ); $i++ ) {
- $performOps[$i]->logFailure(
'attempt_aborted' );
- }
- return $status; // bail out
+ // We can't continue (even with $ignoreErrors)
as $predicates is wrong.
+ // Log the remaining ops as failed for
recovery...
+ for ( $i = ($index + 1); $i < count(
$performOps ); $i++ ) {
+ $performOps[$i]->logFailure(
'attempt_aborted' );
}
+ return $status; // bail out
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
