| Index: branches/wmf/1.18wmf1/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -410,7 +410,7 @@ |
| 411 | 411 | ' parsedcomment - Adds parsed comment of the edit', |
| 412 | 412 | ' timestamp - Adds timestamp of the edit', |
| 413 | 413 | ' patrol - Tags edits that are patrolled', |
| 414 | | - ' size - Adds the old and new lengths of the page', |
| | 414 | + ' sizes - Adds the old and new lengths of the page', |
| 415 | 415 | ' notificationtimestamp - Adds timestamp of when the user was last notified about the edit', |
| 416 | 416 | ' loginfo - Adds log information where appropriate', |
| 417 | 417 | ), |
| Property changes on: branches/wmf/1.18wmf1/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 418 | 418 | Merged /trunk/phase3/includes/api:r101314 |
| Index: branches/wmf/1.18wmf1/includes/media/JpegMetadataExtractor.php |
| — | — | @@ -62,6 +62,10 @@ |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | $buffer = fread( $fh, 1 ); |
| | 66 | + while( $buffer === "\xFF" && !feof( $fh ) ) { |
| | 67 | + // Skip through any 0xFF padding bytes. |
| | 68 | + $buffer = fread( $fh, 1 ); |
| | 69 | + } |
| 66 | 70 | if ( $buffer === "\xFE" ) { |
| 67 | 71 | |
| 68 | 72 | // COM section -- file comment |
| — | — | @@ -123,9 +127,6 @@ |
| 124 | 128 | } elseif ( $buffer === "\xD9" || $buffer === "\xDA" ) { |
| 125 | 129 | // EOI - end of image or SOS - start of scan. either way we're past any interesting segments |
| 126 | 130 | return $segments; |
| 127 | | - } elseif ( $buffer === "\xFF" ) { |
| 128 | | - // Padding byte. Skip. |
| 129 | | - continue; |
| 130 | 131 | } else { |
| 131 | 132 | // segment we don't care about, so skip |
| 132 | 133 | $size = wfUnpack( "nint", fread( $fh, 2 ), 2 ); |
| Property changes on: branches/wmf/1.18wmf1/includes/media |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 133 | 134 | Merged /trunk/phase3/includes/media:r100575,101291 |
| Index: branches/wmf/1.18wmf1/includes/parser/CoreParserFunctions.php |
| — | — | @@ -98,8 +98,7 @@ |
| 99 | 99 | if ( strval( $part1 ) !== '' ) { |
| 100 | 100 | $args = array_slice( func_get_args(), 2 ); |
| 101 | 101 | $message = wfMessage( $part1, $args )->inLanguage( $parser->getOptions()->getUserLang() )->plain(); |
| 102 | | - $message = $parser->replaceVariables( $message ); // like MessageCache::transform() |
| 103 | | - return $message; |
| | 102 | + return array( $message, 'noparse' => false ); |
| 104 | 103 | } else { |
| 105 | 104 | return array( 'found' => false ); |
| 106 | 105 | } |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 107 | 106 | Merged /trunk/phase3/includes:r100575,101291,101314 |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 108 | 107 | Merged /trunk/phase3:r100575,101291,101314 |