| Index: trunk/phase3/maintenance/Maintenance.php |
| — | — | @@ -314,8 +314,7 @@ |
| 315 | 315 | } else { |
| 316 | 316 | print( $out ); |
| 317 | 317 | } |
| 318 | | - } |
| 319 | | - else { |
| | 318 | + } else { |
| 320 | 319 | $out = preg_replace( '/\n\z/', '', $out ); |
| 321 | 320 | $this->outputChanneled( $out, $channel ); |
| 322 | 321 | } |
| Index: trunk/phase3/includes/search/SearchEngine.php |
| — | — | @@ -1203,22 +1203,27 @@ |
| 1204 | 1204 | * @return String |
| 1205 | 1205 | */ |
| 1206 | 1206 | function extract( $text, $start, $end, &$posStart = null, &$posEnd = null ) { |
| 1207 | | - if ( $start != 0 ) |
| | 1207 | + if ( $start != 0 ) { |
| 1208 | 1208 | $start = $this->position( $text, $start, 1 ); |
| 1209 | | - if ( $end >= strlen( $text ) ) |
| | 1209 | + } |
| | 1210 | + if ( $end >= strlen( $text ) ) { |
| 1210 | 1211 | $end = strlen( $text ); |
| 1211 | | - else |
| | 1212 | + } else { |
| 1212 | 1213 | $end = $this->position( $text, $end ); |
| | 1214 | + } |
| 1213 | 1215 | |
| 1214 | | - if ( !is_null( $posStart ) ) |
| | 1216 | + if ( !is_null( $posStart ) ) { |
| 1215 | 1217 | $posStart = $start; |
| 1216 | | - if ( !is_null( $posEnd ) ) |
| | 1218 | + } |
| | 1219 | + if ( !is_null( $posEnd ) ) { |
| 1217 | 1220 | $posEnd = $end; |
| | 1221 | + } |
| 1218 | 1222 | |
| 1219 | | - if ( $end > $start ) |
| | 1223 | + if ( $end > $start ) { |
| 1220 | 1224 | return substr( $text, $start, $end - $start ); |
| 1221 | | - else |
| | 1225 | + } else { |
| 1222 | 1226 | return ''; |
| | 1227 | + } |
| 1223 | 1228 | } |
| 1224 | 1229 | |
| 1225 | 1230 | /** |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -4278,7 +4278,7 @@ |
| 4279 | 4279 | /** |
| 4280 | 4280 | * Get a backlink cache object |
| 4281 | 4281 | * |
| 4282 | | - * @return object BacklinkCache |
| | 4282 | + * @return BacklinkCache |
| 4283 | 4283 | */ |
| 4284 | 4284 | function getBacklinkCache() { |
| 4285 | 4285 | if ( is_null( $this->mBacklinkCache ) ) { |