| Index: branches/REL1_15/phase3/includes/filerepo/ForeignAPIFile.php |
| — | — | @@ -60,15 +60,22 @@ |
| 61 | 61 | |
| 62 | 62 | public function getMetadata() { |
| 63 | 63 | if ( isset( $this->mInfo['metadata'] ) ) { |
| 64 | | - $ret = array(); |
| 65 | | - foreach( $this->mInfo['metadata'] as $meta ) { |
| 66 | | - $ret[ $meta['name'] ] = $meta['value']; |
| 67 | | - } |
| 68 | | - return serialize( $ret ); |
| | 64 | + return serialize( self::parseMetadata( $this->mInfo['metadata'] ) ); |
| 69 | 65 | } |
| 70 | 66 | return null; |
| 71 | 67 | } |
| 72 | 68 | |
| | 69 | + public static function parseMetadata( $metadata ) { |
| | 70 | + if( !is_array( $metadata ) ) { |
| | 71 | + return $metadata; |
| | 72 | + } |
| | 73 | + $ret = array(); |
| | 74 | + foreach( $metadata as $meta ) { |
| | 75 | + $ret[ $meta['name'] ] = self::parseMetadata( $meta['value'] ); |
| | 76 | + } |
| | 77 | + return $ret; |
| | 78 | + } |
| | 79 | + |
| 73 | 80 | public function getSize() { |
| 74 | 81 | return intval( @$this->mInfo['size'] ); |
| 75 | 82 | } |
| Property changes on: branches/REL1_15/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 76 | 83 | - /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50070,50132,50134,50169,50218 |
| 77 | 84 | + /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218 |
| Index: branches/REL1_15/phase3/includes/specials/SpecialExport.php |
| — | — | @@ -346,6 +346,7 @@ |
| 347 | 347 | $pageSet = $this->getLinks( $inputPages, $pageSet, 'pagelinks', |
| 348 | 348 | array( 'pl_namespace AS namespace', 'pl_title AS title' ), |
| 349 | 349 | array( 'page_id=pl_from' ) ); |
| | 350 | + $inputPages = array_keys( $pageSet ); |
| 350 | 351 | } |
| 351 | 352 | return $pageSet; |
| 352 | 353 | } |
| Property changes on: branches/REL1_15/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 353 | 354 | - /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50070,50132,50134,50169,50218 |
| /trunk/phase3/includes/specials/specials:48993 |
| 354 | 355 | + /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218 |
| /trunk/phase3/includes/specials/specials:48993 |
| Property changes on: branches/REL1_15/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 355 | 356 | - /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50070,50132,50134,50169,50218 |
| /trunk/phase3/includes/specials:48993 |
| 356 | 357 | + /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218 |
| /trunk/phase3/includes/specials:48993 |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 357 | 358 | - /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50070,50132,50134,50169,50218 |
| 358 | 359 | + /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218 |