| Index: branches/REL1_19/phase3/includes/RecentChange.php |
| — | — | @@ -166,7 +166,7 @@ |
| 167 | 167 | * @param $noudp bool |
| 168 | 168 | */ |
| 169 | 169 | public function save( $noudp = false ) { |
| 170 | | - global $wgLocalInterwiki, $wgPutIPinRC; |
| | 170 | + global $wgLocalInterwiki, $wgPutIPinRC, $wgContLang; |
| 171 | 171 | |
| 172 | 172 | $dbw = wfGetDB( DB_MASTER ); |
| 173 | 173 | if( !is_array($this->mExtra) ) { |
| — | — | @@ -183,6 +183,9 @@ |
| 184 | 184 | unset( $this->mAttribs['rc_ip'] ); |
| 185 | 185 | } |
| 186 | 186 | |
| | 187 | + # Make sure summary is truncated (whole multibyte characters) |
| | 188 | + $this->mAttribs['rc_comment'] = $wgContLang->truncate( $this->mAttribs['rc_comment'], 255 ); |
| | 189 | + |
| 187 | 190 | # Fixup database timestamps |
| 188 | 191 | $this->mAttribs['rc_timestamp'] = $dbw->timestamp($this->mAttribs['rc_timestamp']); |
| 189 | 192 | $this->mAttribs['rc_cur_time'] = $dbw->timestamp($this->mAttribs['rc_cur_time']); |
| Index: branches/REL1_19/phase3/includes/filerepo/backend/FileOp.php |
| — | — | @@ -134,13 +134,12 @@ |
| 135 | 135 | } else { |
| 136 | 136 | $status->success[$index] = false; |
| 137 | 137 | ++$status->failCount; |
| 138 | | - if ( !$ignoreErrors ) { |
| 139 | | - // Log remaining ops as failed for recovery... |
| 140 | | - for ( $i = ($index + 1); $i < count( $performOps ); $i++ ) { |
| 141 | | - $performOps[$i]->logFailure( 'attempt_aborted' ); |
| 142 | | - } |
| 143 | | - return $status; // bail out |
| | 138 | + // We can't continue (even with $ignoreErrors) as $predicates is wrong. |
| | 139 | + // Log the remaining ops as failed for recovery... |
| | 140 | + for ( $i = ($index + 1); $i < count( $performOps ); $i++ ) { |
| | 141 | + $performOps[$i]->logFailure( 'attempt_aborted' ); |
| 144 | 142 | } |
| | 143 | + return $status; // bail out |
| 145 | 144 | } |
| 146 | 145 | } |
| 147 | 146 | |
| Index: branches/REL1_19/phase3/includes/api/ApiBase.php |
| — | — | @@ -1269,6 +1269,7 @@ |
| 1270 | 1270 | * @return array('code' => code, 'info' => info) |
| 1271 | 1271 | */ |
| 1272 | 1272 | public function parseMsg( $error ) { |
| | 1273 | + $error = (array)$error; // It seems strings sometimes make their way in here |
| 1273 | 1274 | $key = array_shift( $error ); |
| 1274 | 1275 | |
| 1275 | 1276 | // Check whether the error array was nested |
| Property changes on: branches/REL1_19/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1276 | 1277 | Merged /trunk/phase3/includes/api:r113211 |
| Property changes on: branches/REL1_19/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1277 | 1278 | Merged /trunk/phase3/includes:r113171,113195,113211 |
| Property changes on: branches/REL1_19/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1278 | 1279 | Merged /trunk/phase3:r113171,113195,113211 |