https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112532
Revision: 112532
Author: reedy
Date: 2012-02-27 22:31:25 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
MFT r112374, r112383, r112397, r112408, r112474
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/ImagePage.php
branches/wmf/1.19wmf1/includes/api/ApiQueryLogEvents.php
branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
branches/wmf/1.19wmf1/includes/specials/SpecialWhatlinkshere.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/api/
branches/wmf/1.19wmf1/includes/specials/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
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,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112378,112381
+ /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,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474
Property changes on: branches/wmf/1.19wmf1/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,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112378,112381
+ /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,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474
Modified: branches/wmf/1.19wmf1/includes/ImagePage.php
===================================================================
--- branches/wmf/1.19wmf1/includes/ImagePage.php 2012-02-27 22:24:49 UTC
(rev 112531)
+++ branches/wmf/1.19wmf1/includes/ImagePage.php 2012-02-27 22:31:25 UTC
(rev 112532)
@@ -108,8 +108,6 @@
}
}
- $this->showRedirectedFromHeader();
-
if ( $wgShowEXIF && $this->displayImg->exists() ) {
// @todo FIXME: Bad interface, see note on
MediaHandler::formatMetadata().
$formattedMetadata =
$this->displayImg->formatMetadata();
Property changes on: branches/wmf/1.19wmf1/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:111397,111673,112290
+ /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:111397,111673,112290,112374,112383,112397,112408,112474
Modified: branches/wmf/1.19wmf1/includes/api/ApiQueryLogEvents.php
===================================================================
--- branches/wmf/1.19wmf1/includes/api/ApiQueryLogEvents.php 2012-02-27
22:24:49 UTC (rev 112531)
+++ branches/wmf/1.19wmf1/includes/api/ApiQueryLogEvents.php 2012-02-27
22:31:25 UTC (rev 112532)
@@ -198,25 +198,26 @@
* @return array
*/
public static function addLogParams( $result, &$vals, $params, $type,
$action, $ts ) {
- $params = explode( "\n", $params );
switch ( $type ) {
case 'move':
- if ( isset( $params[0] ) ) {
- $title = Title::newFromText( $params[0]
);
+ if ( isset( $params[ '4::target' ] ) ) {
+ $title = Title::newFromText( $params[
'4::target' ] );
if ( $title ) {
$vals2 = array();
ApiQueryBase::addTitleInfo(
$vals2, $title, 'new_' );
$vals[$type] = $vals2;
}
}
- if ( isset( $params[1] ) && $params[1] ) {
+ if ( isset( $params[ '5::noredir' ] ) &&
$params[ '5::noredir' ] ) {
$vals[$type]['suppressedredirect'] = '';
}
$params = null;
break;
case 'patrol':
$vals2 = array();
- list( $vals2['cur'], $vals2['prev'],
$vals2['auto'] ) = $params;
+ $vals2[ 'cur' ] = $params[ '4::curid' ];
+ $vals2[ 'prev' ] = $params[ '5::previd' ];
+ $vals2[ 'auto' ] = $params[ '6::auto' ];
$vals[$type] = $vals2;
$params = null;
break;
@@ -250,6 +251,7 @@
}
private function extractRowInfo( $row ) {
+ $logEntry = DatabaseLogEntry::newFromRow( $row );
$vals = array();
if ( $this->fld_ids ) {
@@ -281,10 +283,10 @@
self::addLogParams(
$this->getResult(),
$vals,
- $row->log_params,
- $row->log_type,
- $row->log_action,
- $row->log_timestamp
+ $logEntry->getParameters(),
+ $logEntry->getType(),
+ $logEntry->getSubtype(),
+ $logEntry->getTimestamp()
);
}
}
Modified: branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
===================================================================
--- branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
2012-02-27 22:24:49 UTC (rev 112531)
+++ branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
2012-02-27 22:31:25 UTC (rev 112532)
@@ -1241,7 +1241,7 @@
}
// Set output buffer and HTTP headers for stream
- $extraHeaders = $params['headers'] ? $params['headers'] :
array();
+ $extraHeaders = isset( $params['headers'] ) ?
$params['headers'] : array();
$res = StreamFile::prepareForStream( $params['src'], $info,
$extraHeaders );
if ( $res == StreamFile::NOT_MODIFIED ) {
// do nothing; client cache is up to date
Property changes on: branches/wmf/1.19wmf1/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/specials:100352-107913
/branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:111085,111128,111144,111251,111750
+ /branches/JSTesting/includes/specials:100352-107913
/branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:111085,111128,111144,111251,111750,112397,112408,112474
Modified: branches/wmf/1.19wmf1/includes/specials/SpecialWhatlinkshere.php
===================================================================
--- branches/wmf/1.19wmf1/includes/specials/SpecialWhatlinkshere.php
2012-02-27 22:24:49 UTC (rev 112531)
+++ branches/wmf/1.19wmf1/includes/specials/SpecialWhatlinkshere.php
2012-02-27 22:31:25 UTC (rev 112532)
@@ -51,6 +51,7 @@
$out = $this->getOutput();
$this->setHeaders();
+ $this->outputHeader();
$opts = new FormOptions();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
