| Index: branches/wmf/1.19wmf1/includes/ImagePage.php |
| — | — | @@ -108,8 +108,6 @@ |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | | - $this->showRedirectedFromHeader(); |
| 113 | | - |
| 114 | 112 | if ( $wgShowEXIF && $this->displayImg->exists() ) { |
| 115 | 113 | // @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata(). |
| 116 | 114 | $formattedMetadata = $this->displayImg->formatMetadata(); |
| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -1241,7 +1241,7 @@ |
| 1242 | 1242 | } |
| 1243 | 1243 | |
| 1244 | 1244 | // Set output buffer and HTTP headers for stream |
| 1245 | | - $extraHeaders = $params['headers'] ? $params['headers'] : array(); |
| | 1245 | + $extraHeaders = isset( $params['headers'] ) ? $params['headers'] : array(); |
| 1246 | 1246 | $res = StreamFile::prepareForStream( $params['src'], $info, $extraHeaders ); |
| 1247 | 1247 | if ( $res == StreamFile::NOT_MODIFIED ) { |
| 1248 | 1248 | // do nothing; client cache is up to date |
| Index: branches/wmf/1.19wmf1/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -198,25 +198,26 @@ |
| 199 | 199 | * @return array |
| 200 | 200 | */ |
| 201 | 201 | public static function addLogParams( $result, &$vals, $params, $type, $action, $ts ) { |
| 202 | | - $params = explode( "\n", $params ); |
| 203 | 202 | switch ( $type ) { |
| 204 | 203 | case 'move': |
| 205 | | - if ( isset( $params[0] ) ) { |
| 206 | | - $title = Title::newFromText( $params[0] ); |
| | 204 | + if ( isset( $params[ '4::target' ] ) ) { |
| | 205 | + $title = Title::newFromText( $params[ '4::target' ] ); |
| 207 | 206 | if ( $title ) { |
| 208 | 207 | $vals2 = array(); |
| 209 | 208 | ApiQueryBase::addTitleInfo( $vals2, $title, 'new_' ); |
| 210 | 209 | $vals[$type] = $vals2; |
| 211 | 210 | } |
| 212 | 211 | } |
| 213 | | - if ( isset( $params[1] ) && $params[1] ) { |
| | 212 | + if ( isset( $params[ '5::noredir' ] ) && $params[ '5::noredir' ] ) { |
| 214 | 213 | $vals[$type]['suppressedredirect'] = ''; |
| 215 | 214 | } |
| 216 | 215 | $params = null; |
| 217 | 216 | break; |
| 218 | 217 | case 'patrol': |
| 219 | 218 | $vals2 = array(); |
| 220 | | - list( $vals2['cur'], $vals2['prev'], $vals2['auto'] ) = $params; |
| | 219 | + $vals2[ 'cur' ] = $params[ '4::curid' ]; |
| | 220 | + $vals2[ 'prev' ] = $params[ '5::previd' ]; |
| | 221 | + $vals2[ 'auto' ] = $params[ '6::auto' ]; |
| 221 | 222 | $vals[$type] = $vals2; |
| 222 | 223 | $params = null; |
| 223 | 224 | break; |
| — | — | @@ -250,6 +251,7 @@ |
| 251 | 252 | } |
| 252 | 253 | |
| 253 | 254 | private function extractRowInfo( $row ) { |
| | 255 | + $logEntry = DatabaseLogEntry::newFromRow( $row ); |
| 254 | 256 | $vals = array(); |
| 255 | 257 | |
| 256 | 258 | if ( $this->fld_ids ) { |
| — | — | @@ -281,10 +283,10 @@ |
| 282 | 284 | self::addLogParams( |
| 283 | 285 | $this->getResult(), |
| 284 | 286 | $vals, |
| 285 | | - $row->log_params, |
| 286 | | - $row->log_type, |
| 287 | | - $row->log_action, |
| 288 | | - $row->log_timestamp |
| | 287 | + $logEntry->getParameters(), |
| | 288 | + $logEntry->getType(), |
| | 289 | + $logEntry->getSubtype(), |
| | 290 | + $logEntry->getTimestamp() |
| 289 | 291 | ); |
| 290 | 292 | } |
| 291 | 293 | } |
| Property changes on: branches/wmf/1.19wmf1/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 292 | 294 | Merged /trunk/phase3/includes/api:r112374,112383,112397,112408,112474 |
| Index: branches/wmf/1.19wmf1/includes/specials/SpecialWhatlinkshere.php |
| — | — | @@ -51,6 +51,7 @@ |
| 52 | 52 | $out = $this->getOutput(); |
| 53 | 53 | |
| 54 | 54 | $this->setHeaders(); |
| | 55 | + $this->outputHeader(); |
| 55 | 56 | |
| 56 | 57 | $opts = new FormOptions(); |
| 57 | 58 | |
| Property changes on: branches/wmf/1.19wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 58 | 59 | Merged /trunk/phase3/includes/specials:r112397,112408,112474 |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 59 | 60 | Merged /trunk/phase3/includes:r112374,112383,112397,112408,112474 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 60 | 61 | Merged /trunk/phase3:r112374,112383,112397,112408,112474 |