| Index: branches/wmf/1.18wmf1/includes/media/JpegMetadataExtractor.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | throw new MWException( 'Too many jpeg segments. Aborting' ); |
| 60 | 60 | } |
| 61 | 61 | if ( $buffer !== "\xFF" ) { |
| 62 | | - throw new MWException( "Error reading jpeg file marker" ); |
| | 62 | + throw new MWException( "Error reading jpeg file marker. Expected 0xFF but got " . bin2hex( $buffer ) ); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | $buffer = fread( $fh, 1 ); |
| — | — | @@ -123,6 +123,9 @@ |
| 124 | 124 | } elseif ( $buffer === "\xD9" || $buffer === "\xDA" ) { |
| 125 | 125 | // EOI - end of image or SOS - start of scan. either way we're past any interesting segments |
| 126 | 126 | return $segments; |
| | 127 | + } elseif ( $buffer === "\xFF" ) { |
| | 128 | + // Padding byte. Skip. |
| | 129 | + continue; |
| 127 | 130 | } else { |
| 128 | 131 | // segment we don't care about, so skip |
| 129 | 132 | $size = wfUnpack( "nint", fread( $fh, 2 ), 2 ); |
| Property changes on: branches/wmf/1.18wmf1/includes/media |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 130 | 133 | Merged /trunk/phase3/includes/media:r99477 |
| Index: branches/wmf/1.18wmf1/includes/Wiki.php |
| — | — | @@ -147,8 +147,10 @@ |
| 148 | 148 | array( &$title, null, &$output, &$user, $request, $this ) ); |
| 149 | 149 | |
| 150 | 150 | // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty. |
| 151 | | - if ( is_null( $title ) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) { |
| 152 | | - $this->context->title = SpecialPage::getTitleFor( 'Badtitle' ); |
| | 151 | + if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) || |
| | 152 | + $title->isSpecial( 'Badtitle' ) ) |
| | 153 | + { |
| | 154 | + $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) ); |
| 153 | 155 | // Die now before we mess up $wgArticle and the skin stops working |
| 154 | 156 | throw new ErrorPageError( 'badtitle', 'badtitletext' ); |
| 155 | 157 | // If the user is not logged in, the Namespace:title of the article must be in |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 156 | 158 | Merged /trunk/phase3/includes:r98764,99477 |
| Index: branches/wmf/1.18wmf1/resources/jquery.ui/themes/vector/jquery.ui.button.css |
| — | — | @@ -9,22 +9,22 @@ |
| 10 | 10 | |
| 11 | 11 | /*button text element */ |
| 12 | 12 | .ui-button .ui-button-text { display: block; line-height: 1.4em; } |
| 13 | | -.ui-button-text-only .ui-button-text { padding: .125em .25em; } |
| 14 | | -.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } |
| 15 | | -.ui-button-text-icon-primary .ui-button-text { padding: 0.1em 0.8em 0.1em 1.9em; } |
| 16 | | -.ui-button-text-icon-secondary .ui-button-text { padding: .1em 1.9em .1em 0.8em; } |
| 17 | | -.ui-button-text-icons .ui-button-text { padding: 0.1em 1.9em 0.1em 1.9em; } |
| | 13 | +.ui-button-text-only .ui-button-text { padding: 0.3em 1em 0.25em 1em; } |
| | 14 | +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 0.3em; text-indent: -9999999px; } |
| | 15 | +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: 0.3em 1em 0.25em 2.1em; } |
| | 16 | +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: 0.3em 2.1em 0.25em 1em; } |
| | 17 | +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } |
| 18 | 18 | /* for older versions of jQuery UI */ |
| 19 | | -.ui-button-text-icon .ui-button-text { padding: 0.1em 0.8em 0.1em 1.9em; } |
| | 19 | +.ui-button-text-icon .ui-button-text { padding: 0.3em 1em 0.3em 2.1em; } |
| 20 | 20 | |
| 21 | 21 | /* no icon support for input elements, provide padding by default */ |
| 22 | | -input.ui-button { padding: .4em 1em; } |
| | 22 | +input.ui-button { padding: 0.3em 1em; } |
| 23 | 23 | |
| 24 | 24 | /*button icon element(s) */ |
| 25 | 25 | .ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -9px; } |
| 26 | 26 | .ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } |
| 27 | | -.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: 0; } |
| 28 | | -.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icon .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: 16px; } |
| | 27 | +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: 0.5em; } |
| | 28 | +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icon .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: 0.5em; } |
| 29 | 29 | |
| 30 | 30 | /*button sets*/ |
| 31 | 31 | .ui-buttonset { margin-right: 7px; } |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | body .ui-button { |
| 38 | 38 | -moz-border-radius: 4px; |
| 39 | 39 | -webkit-border-radius: 4px; |
| 40 | | - padding: 0.2em 0.6em 0.15em !important; |
| | 40 | + border-radius: 4px; |
| 41 | 41 | margin: 0.5em 0 0.5em 0.4em !important; |
| 42 | 42 | border: 1px solid #a6a6a6 !important; |
| 43 | 43 | /* @embed */ |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 44 | 44 | Merged /trunk/phase3:r92846,98764,99477 |