| Index: branches/REL1_18/phase3/maintenance/createAndPromote.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | |
| 63 | 63 | # Promote user |
| 64 | 64 | if ( $this->hasOption( 'sysop' ) ) { |
| 65 | | - $user->addGroup( 'bureaucrat' ); |
| | 65 | + $user->addGroup( 'sysop' ); |
| 66 | 66 | } |
| 67 | 67 | if ( $this->hasOption( 'bureaucrat' ) ) { |
| 68 | 68 | $user->addGroup( 'bureaucrat' ); |
| Index: branches/REL1_18/phase3/skins/chick/main.css |
| — | — | @@ -146,12 +146,6 @@ |
| 147 | 147 | color: black; |
| 148 | 148 | vertical-align: top; |
| 149 | 149 | } |
| 150 | | -abbr, acronym, .explain { |
| 151 | | - border-bottom: 1px dotted black; |
| 152 | | - color: black; |
| 153 | | - background: none; |
| 154 | | - cursor: help; |
| 155 | | -} |
| 156 | 150 | q { |
| 157 | 151 | font-family: Times, "Times New Roman", serif; |
| 158 | 152 | font-style: italic; |
| Index: branches/REL1_18/phase3/skins/monobook/main.css |
| — | — | @@ -199,12 +199,6 @@ |
| 200 | 200 | select { |
| 201 | 201 | vertical-align: top; |
| 202 | 202 | } |
| 203 | | -abbr, acronym, .explain { |
| 204 | | - border-bottom: 1px dotted black; |
| 205 | | - color: black; |
| 206 | | - background: none; |
| 207 | | - cursor: help; |
| 208 | | -} |
| 209 | 203 | q { |
| 210 | 204 | font-family: Times, "Times New Roman", serif; |
| 211 | 205 | font-style: italic; |
| Index: branches/REL1_18/phase3/skins/common/shared.css |
| — | — | @@ -4,6 +4,12 @@ |
| 5 | 5 | * another, but don't ignore the poor pre-Monobook users either. |
| 6 | 6 | */ |
| 7 | 7 | |
| | 8 | +/* Default style for semantic tags */ |
| | 9 | +abbr, acronym, .explain { |
| | 10 | + border-bottom: 1px dotted black; |
| | 11 | + cursor: help; |
| | 12 | +} |
| | 13 | + |
| 8 | 14 | /* Colored watchlist and recent changes numbers */ |
| 9 | 15 | .mw-plusminus-pos { color: #006400; } /* dark green */ |
| 10 | 16 | .mw-plusminus-neg { color: #8b0000; } /* dark red */ |
| Index: branches/REL1_18/phase3/skins/vector/screen.css |
| — | — | @@ -765,16 +765,8 @@ |
| 766 | 766 | margin: .4em 0 .5em 0; |
| 767 | 767 | line-height: 1.5em; |
| 768 | 768 | } |
| 769 | | - p img { |
| 770 | | - margin: 0; |
| 771 | | - } |
| 772 | | -abbr, |
| 773 | | -acronym, |
| 774 | | -.explain { |
| 775 | | - border-bottom: 1px dotted black; |
| 776 | | - color: black; |
| 777 | | - background: none; |
| 778 | | - cursor: help; |
| | 769 | +p img { |
| | 770 | + margin: 0; |
| 779 | 771 | } |
| 780 | 772 | q { |
| 781 | 773 | font-family: Times, "Times New Roman", serif; |
| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -250,6 +250,7 @@ |
| 251 | 251 | * (bug 28076) Thumbnail height limited to 360 pixels on Special:Listfiles |
| 252 | 252 | * (bug 22227) Special:Listfiles no longer throws an error on bogus file entries |
| 253 | 253 | * (bug 19408) user_properties.up_property: 32 bytes is not enough. |
| | 254 | +* (bug 25262) Fix for minification of hardcoded data: URIs in CSS |
| 254 | 255 | |
| 255 | 256 | === API changes in 1.18 === |
| 256 | 257 | * (bug 26339) Throw warning when truncating an overlarge API result. |
| Index: branches/REL1_18/phase3/includes/installer/Installer.php |
| — | — | @@ -1150,7 +1150,13 @@ |
| 1151 | 1151 | break; |
| 1152 | 1152 | } |
| 1153 | 1153 | |
| 1154 | | - $text = Http::get( $url . $file, array( 'timeout' => 3 ) ); |
| | 1154 | + try { |
| | 1155 | + $text = Http::get( $url . $file, array( 'timeout' => 3 ) ); |
| | 1156 | + } |
| | 1157 | + catch( MWException $e ) { |
| | 1158 | + // Http::get throws with allow_url_fopen = false and no curl extension. |
| | 1159 | + $text = null; |
| | 1160 | + } |
| 1155 | 1161 | unlink( $dir . $file ); |
| 1156 | 1162 | |
| 1157 | 1163 | if ( $text == 'exec' ) { |
| Property changes on: branches/REL1_18/phase3/includes/installer |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1158 | 1164 | Merged /trunk/phase3/includes/installer:r87586,87840,88085,88118,88124,88492,88498 |
| Index: branches/REL1_18/phase3/includes/libs/CSSMin.php |
| — | — | @@ -120,8 +120,9 @@ |
| 121 | 121 | self::URL_REGEX . '(?P<post>[^;]*)[\;]?/'; |
| 122 | 122 | $offset = 0; |
| 123 | 123 | while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) { |
| 124 | | - // Skip absolute URIs |
| 125 | | - if ( preg_match( '/^https?:\/\//', $match['file'][0] ) ) { |
| | 124 | + // Skip fully-qualified URLs and data URIs |
| | 125 | + $urlScheme = parse_url( $match['file'][0], PHP_URL_SCHEME ); |
| | 126 | + if ( $urlScheme ) { |
| 126 | 127 | // Move the offset to the end of the match, leaving it alone |
| 127 | 128 | $offset = $match[0][1] + strlen( $match[0][0] ); |
| 128 | 129 | continue; |
| Index: branches/REL1_18/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -109,6 +109,7 @@ |
| 110 | 110 | 'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett', 'Raimond Spekking', |
| 111 | 111 | 'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad Horohoe', |
| 112 | 112 | 'Roan Kattouw', 'Trevor Parscal', 'Bryan Tong Minh', 'Sam Reed', |
| | 113 | + 'Victor Vasiliev', 'Rotem Liss', 'Platonides', |
| 113 | 114 | wfMsg( 'version-poweredby-others' ) |
| 114 | 115 | ); |
| 115 | 116 | |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 116 | 117 | Merged /trunk/phase3/includes/specials:r87586,87840,88085,88118,88124,88492,88498 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 117 | 118 | Merged /trunk/phase3/includes:r87586,87840,88085,88118,88124,88492,88498 |
| Index: branches/REL1_18/phase3/resources/mediawiki.util/mediawiki.util.js |
| — | — | @@ -271,17 +271,6 @@ |
| 272 | 272 | '$content' : null, |
| 273 | 273 | |
| 274 | 274 | /** |
| 275 | | - * Checks wether the current page is the wiki's main page. |
| 276 | | - * |
| 277 | | - * @return Boolean |
| 278 | | - * @deprecated to be removed in 1.18: Use wgIsMainPage in mw.config instead. |
| 279 | | - */ |
| 280 | | - 'isMainPage' : function() { |
| 281 | | - return mw.config.get( 'wgIsMainPage' ); |
| 282 | | - }, |
| 283 | | - |
| 284 | | - |
| 285 | | - /** |
| 286 | 275 | * Add a link to a portlet menu on the page, such as: |
| 287 | 276 | * |
| 288 | 277 | * p-cactions (Content actions), p-personal (Personal tools), |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 289 | 278 | Merged /trunk/phase3:r87586,87840,88085,88118,88124,88492,88498 |