| Index: branches/wmf/1.17wmf1/includes/revisiondelete/RevisionDelete.php |
| — | — | @@ -220,7 +220,7 @@ |
| 221 | 221 | */ |
| 222 | 222 | class RevDel_ArchiveItem extends RevDel_RevisionItem { |
| 223 | 223 | public function __construct( $list, $row ) { |
| 224 | | - parent::__construct( $list, $row ); |
| | 224 | + RevDel_Item::__construct( $list, $row ); |
| 225 | 225 | $this->revision = Revision::newFromArchiveRow( $row, |
| 226 | 226 | array( 'page' => $this->list->title->getArticleId() ) ); |
| 227 | 227 | } |
| — | — | @@ -526,7 +526,7 @@ |
| 527 | 527 | */ |
| 528 | 528 | class RevDel_ArchivedFileItem extends RevDel_FileItem { |
| 529 | 529 | public function __construct( $list, $row ) { |
| 530 | | - parent::__construct( $list, $row ); |
| | 530 | + RevDel_Item::__construct( $list, $row ); |
| 531 | 531 | $this->file = ArchivedFile::newFromRow( $row ); |
| 532 | 532 | } |
| 533 | 533 | |
| Property changes on: branches/wmf/1.17wmf1/includes/revisiondelete/RevisionDelete.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 534 | 534 | Merged /branches/sqlite/includes/revisiondelete/RevisionDelete.php:r58211-58321 |
| 535 | 535 | Merged /trunk/phase3/includes/revisiondelete/RevisionDelete.php:r78380 |
| 536 | 536 | Merged /branches/new-installer/phase3/includes/revisiondelete/RevisionDelete.php:r43664-66004 |
| 537 | 537 | Merged /branches/wmf-deployment/includes/revisiondelete/RevisionDelete.php:r53381,60970 |
| 538 | 538 | Merged /branches/REL1_15/phase3/includes/revisiondelete/RevisionDelete.php:r51646 |
| 539 | 539 | Merged /branches/wmf/1.16wmf4/includes/revisiondelete/RevisionDelete.php:r67177,69199,76243,77266 |
| Index: branches/wmf/1.17wmf1/includes/media/Bitmap_ClientOnly.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | */ |
| 18 | 18 | class BitmapHandler_ClientOnly extends BitmapHandler { |
| 19 | 19 | function normaliseParams( $image, &$params ) { |
| 20 | | - return parent::normaliseParams( $image, $params ); |
| | 20 | + return ImageHandler::normaliseParams( $image, $params ); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) { |
| Property changes on: branches/wmf/1.17wmf1/includes/media/Bitmap_ClientOnly.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 24 | 24 | Merged /branches/new-installer/phase3/includes/media/Bitmap_ClientOnly.php:r43664-66004 |
| 25 | 25 | Merged /branches/wmf-deployment/includes/media/Bitmap_ClientOnly.php:r53381,60970 |
| 26 | 26 | Merged /branches/REL1_15/phase3/includes/media/Bitmap_ClientOnly.php:r51646 |
| 27 | 27 | Merged /branches/wmf/1.16wmf4/includes/media/Bitmap_ClientOnly.php:r67177,69199,76243,77266 |
| 28 | 28 | Merged /branches/sqlite/includes/media/Bitmap_ClientOnly.php:r58211-58321 |
| 29 | 29 | Merged /trunk/phase3/includes/media/Bitmap_ClientOnly.php:r78380 |