http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90258
Revision: 90258
Author: tstarling
Date: 2011-06-17 04:46:24 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
MFT r87586, r87840, r88085, r88118, r88124, r88492, r88498
Modified Paths:
--------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/includes/installer/Installer.php
branches/REL1_18/phase3/includes/libs/CSSMin.php
branches/REL1_18/phase3/includes/specials/SpecialVersion.php
branches/REL1_18/phase3/maintenance/createAndPromote.php
branches/REL1_18/phase3/resources/mediawiki.util/mediawiki.util.js
branches/REL1_18/phase3/skins/chick/main.css
branches/REL1_18/phase3/skins/common/shared.css
branches/REL1_18/phase3/skins/monobook/main.css
branches/REL1_18/phase3/skins/vector/screen.css
Property Changed:
----------------
branches/REL1_18/phase3/
branches/REL1_18/phase3/includes/
branches/REL1_18/phase3/includes/installer/
branches/REL1_18/phase3/includes/specials/
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:87632,87636,87640,87644
+ /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:87586,87632,87636,87640,87644,87840,88085,88118,88124,88492,88498
Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===================================================================
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-06-17 03:56:21 UTC (rev
90257)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-06-17 04:46:24 UTC (rev
90258)
@@ -250,6 +250,7 @@
* (bug 28076) Thumbnail height limited to 360 pixels on Special:Listfiles
* (bug 22227) Special:Listfiles no longer throws an error on bogus file entries
* (bug 19408) user_properties.up_property: 32 bytes is not enough.
+* (bug 25262) Fix for minification of hardcoded data: URIs in CSS
=== API changes in 1.18 ===
* (bug 26339) Throw warning when truncating an overlarge API result.
Property changes on: branches/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:87586,87840,88085,88118,88124,88492,88498
Property changes on: branches/REL1_18/phase3/includes/installer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer:51646
/branches/new-installer/phase3/includes/installer:43664-66004
/branches/sqlite/includes/installer:58211-58321
/branches/wmf-deployment/includes/installer:53381
/trunk/phase3/includes/installer:87706,88658
+ /branches/REL1_15/phase3/includes/installer:51646
/branches/new-installer/phase3/includes/installer:43664-66004
/branches/sqlite/includes/installer:58211-58321
/branches/wmf-deployment/includes/installer:53381
/trunk/phase3/includes/installer:87586,87706,87840,88085,88118,88124,88492,88498,88658
Modified: branches/REL1_18/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/Installer.php 2011-06-17
03:56:21 UTC (rev 90257)
+++ branches/REL1_18/phase3/includes/installer/Installer.php 2011-06-17
04:46:24 UTC (rev 90258)
@@ -1150,7 +1150,13 @@
break;
}
- $text = Http::get( $url . $file, array(
'timeout' => 3 ) );
+ try {
+ $text = Http::get( $url . $file, array(
'timeout' => 3 ) );
+ }
+ catch( MWException $e ) {
+ // Http::get throws with
allow_url_fopen = false and no curl extension.
+ $text = null;
+ }
unlink( $dir . $file );
if ( $text == 'exec' ) {
Modified: branches/REL1_18/phase3/includes/libs/CSSMin.php
===================================================================
--- branches/REL1_18/phase3/includes/libs/CSSMin.php 2011-06-17 03:56:21 UTC
(rev 90257)
+++ branches/REL1_18/phase3/includes/libs/CSSMin.php 2011-06-17 04:46:24 UTC
(rev 90258)
@@ -120,8 +120,9 @@
self::URL_REGEX . '(?P<post>[^;]*)[\;]?/';
$offset = 0;
while ( preg_match( $pattern, $source, $match,
PREG_OFFSET_CAPTURE, $offset ) ) {
- // Skip absolute URIs
- if ( preg_match( '/^https?:\/\//', $match['file'][0] )
) {
+ // Skip fully-qualified URLs and data URIs
+ $urlScheme = parse_url( $match['file'][0],
PHP_URL_SCHEME );
+ if ( $urlScheme ) {
// Move the offset to the end of the match,
leaving it alone
$offset = $match[0][1] + strlen( $match[0][0] );
continue;
Property changes on: branches/REL1_18/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:87586,87840,88085,88118,88124,88492,88498
Modified: branches/REL1_18/phase3/includes/specials/SpecialVersion.php
===================================================================
--- branches/REL1_18/phase3/includes/specials/SpecialVersion.php
2011-06-17 03:56:21 UTC (rev 90257)
+++ branches/REL1_18/phase3/includes/specials/SpecialVersion.php
2011-06-17 04:46:24 UTC (rev 90258)
@@ -109,6 +109,7 @@
'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett',
'Raimond Spekking',
'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad
Horohoe',
'Roan Kattouw', 'Trevor Parscal', 'Bryan Tong Minh',
'Sam Reed',
+ 'Victor Vasiliev', 'Rotem Liss', 'Platonides',
wfMsg( 'version-poweredby-others' )
);
Modified: branches/REL1_18/phase3/maintenance/createAndPromote.php
===================================================================
--- branches/REL1_18/phase3/maintenance/createAndPromote.php 2011-06-17
03:56:21 UTC (rev 90257)
+++ branches/REL1_18/phase3/maintenance/createAndPromote.php 2011-06-17
04:46:24 UTC (rev 90258)
@@ -61,7 +61,7 @@
# Promote user
if ( $this->hasOption( 'sysop' ) ) {
- $user->addGroup( 'bureaucrat' );
+ $user->addGroup( 'sysop' );
}
if ( $this->hasOption( 'bureaucrat' ) ) {
$user->addGroup( 'bureaucrat' );
Modified: branches/REL1_18/phase3/resources/mediawiki.util/mediawiki.util.js
===================================================================
--- branches/REL1_18/phase3/resources/mediawiki.util/mediawiki.util.js
2011-06-17 03:56:21 UTC (rev 90257)
+++ branches/REL1_18/phase3/resources/mediawiki.util/mediawiki.util.js
2011-06-17 04:46:24 UTC (rev 90258)
@@ -271,17 +271,6 @@
'$content' : null,
/**
- * Checks wether the current page is the wiki's main page.
- *
- * @return Boolean
- * @deprecated to be removed in 1.18: Use wgIsMainPage in
mw.config instead.
- */
- 'isMainPage' : function() {
- return mw.config.get( 'wgIsMainPage' );
- },
-
-
- /**
* Add a link to a portlet menu on the page, such as:
*
* p-cactions (Content actions), p-personal (Personal tools),
Modified: branches/REL1_18/phase3/skins/chick/main.css
===================================================================
--- branches/REL1_18/phase3/skins/chick/main.css 2011-06-17 03:56:21 UTC
(rev 90257)
+++ branches/REL1_18/phase3/skins/chick/main.css 2011-06-17 04:46:24 UTC
(rev 90258)
@@ -146,12 +146,6 @@
color: black;
vertical-align: top;
}
-abbr, acronym, .explain {
- border-bottom: 1px dotted black;
- color: black;
- background: none;
- cursor: help;
-}
q {
font-family: Times, "Times New Roman", serif;
font-style: italic;
Modified: branches/REL1_18/phase3/skins/common/shared.css
===================================================================
--- branches/REL1_18/phase3/skins/common/shared.css 2011-06-17 03:56:21 UTC
(rev 90257)
+++ branches/REL1_18/phase3/skins/common/shared.css 2011-06-17 04:46:24 UTC
(rev 90258)
@@ -4,6 +4,12 @@
* another, but don't ignore the poor pre-Monobook users either.
*/
+/* Default style for semantic tags */
+abbr, acronym, .explain {
+ border-bottom: 1px dotted black;
+ cursor: help;
+}
+
/* Colored watchlist and recent changes numbers */
.mw-plusminus-pos { color: #006400; } /* dark green */
.mw-plusminus-neg { color: #8b0000; } /* dark red */
Modified: branches/REL1_18/phase3/skins/monobook/main.css
===================================================================
--- branches/REL1_18/phase3/skins/monobook/main.css 2011-06-17 03:56:21 UTC
(rev 90257)
+++ branches/REL1_18/phase3/skins/monobook/main.css 2011-06-17 04:46:24 UTC
(rev 90258)
@@ -199,12 +199,6 @@
select {
vertical-align: top;
}
-abbr, acronym, .explain {
- border-bottom: 1px dotted black;
- color: black;
- background: none;
- cursor: help;
-}
q {
font-family: Times, "Times New Roman", serif;
font-style: italic;
Modified: branches/REL1_18/phase3/skins/vector/screen.css
===================================================================
--- branches/REL1_18/phase3/skins/vector/screen.css 2011-06-17 03:56:21 UTC
(rev 90257)
+++ branches/REL1_18/phase3/skins/vector/screen.css 2011-06-17 04:46:24 UTC
(rev 90258)
@@ -765,16 +765,8 @@
margin: .4em 0 .5em 0;
line-height: 1.5em;
}
- p img {
- margin: 0;
- }
-abbr,
-acronym,
-.explain {
- border-bottom: 1px dotted black;
- color: black;
- background: none;
- cursor: help;
+p img {
+ margin: 0;
}
q {
font-family: Times, "Times New Roman", serif;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
