http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97673
Revision: 97673
Author: reedy
Date: 2011-09-20 22:36:23 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
REL1_18 MFT r96760, r76765, r96810, r97551, r97552, r97575, r97607, r97608,
r97622, r97623, r97235, r97634
Modified Paths:
--------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/includes/AutoLoader.php
branches/REL1_18/phase3/includes/Collation.php
branches/REL1_18/phase3/includes/DefaultSettings.php
branches/REL1_18/phase3/includes/OutputPage.php
branches/REL1_18/phase3/includes/installer/MysqlUpdater.php
branches/REL1_18/phase3/includes/installer/SqliteUpdater.php
branches/REL1_18/phase3/includes/profiler/Profiler.php
branches/REL1_18/phase3/includes/resourceloader/ResourceLoaderContext.php
branches/REL1_18/phase3/maintenance/deleteBatch.php
branches/REL1_18/phase3/resources/mediawiki/mediawiki.js
branches/REL1_18/phase3/skins/CologneBlue.php
branches/REL1_18/phase3/skins/MonoBook.php
branches/REL1_18/phase3/skins/Simple.php
branches/REL1_18/phase3/skins/Standard.php
branches/REL1_18/phase3/skins/common/shared.css
branches/REL1_18/phase3/skins/monobook/IE70Fixes.css
Property Changed:
----------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/includes/AutoLoader.php
branches/REL1_18/phase3/includes/OutputPage.php
Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===================================================================
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-09-20 22:25:54 UTC (rev
97672)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-09-20 22:36:23 UTC (rev
97673)
@@ -202,14 +202,8 @@
* Introduced $wgVaryOnXFPForAPI which will cause the API to send
Vary: X-Forwarded-Proto headers.
* New maintenance script to refresh image metadata
(maintenance/refreshImageMetadata.php)
-* (bug 16428) Include permalink in printable version
-* (bug 30940) Add a hook in User:getDefaultOptions.
- To give extensions a better and more flexible way of providing default
- values for preferences a hook has been introdiced in
User:getDefaultOptions().
- Setting preferences in $wgDefaultUserOptions still work fine, but when
reading
- them (i.e. with array_keys) to get a list of all preferences, then
- $wgDefaultUserOptions should no longer be used as it will contain those set
via
- User:getDefaultOptions().
+* (bug 30722) Add an identity collation that sorts things based on what the
+ unicode code point is (aka pre-1.17 behaviour)
=== Bug fixes in 1.18 ===
* mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php)
Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/RELEASE-NOTES-1.18:51646
/branches/REL1_17/phase3/RELEASE-NOTES-1.18:81445,81448
/branches/new-installer/phase3/RELEASE-NOTES-1.18:43664-66004
/branches/sqlite/RELEASE-NOTES-1.18:58211-58321
/trunk/phase3/RELEASE-NOTES-1.18:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93382-93383,93516-93518,93520,93818-93822,93847,93858,93891,93916,93935-93936,94058,94062,94068,94107,94155,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95014,95016-95017,95023,95042,95072-95073,95155,95171,95327,95332,95409-95410,95422,95426,95436,95442,95458,95467-95468,95470,95475,95493,95521,95525,95540,95562,95570,95597,95601,95608,95627,95647-95648,95651-95653,95655-95656,95659,95663,95674,95790,95812,95855,95899,95999,96087,96180,96227-96228,96286,96297,96386,96393,96405,96427,96460,96472,96509,96522,96606,96643,96645,96655,96659,96687,96762,96764,96775,96825,96829,96833,96964,96998,97141,97143,97177,97296,97298,97362,97365,97381,97515
/trunk/phase3/RELEASE-NOTES-1.19:95655,95999
+ /branches/REL1_15/phase3/RELEASE-NOTES-1.18:51646
/branches/REL1_17/phase3/RELEASE-NOTES-1.18:81445,81448
/branches/new-installer/phase3/RELEASE-NOTES-1.18:43664-66004
/branches/sqlite/RELEASE-NOTES-1.18:58211-58321
/trunk/phase3/RELEASE-NOTES-1.18:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93382-93383,93516-93518,93520,93818-93822,93847,93858,93891,93916,93935-93936,94058,94062,94068,94107,94155,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95014,95016-95017,95023,95042,95072-95073,95155,95171,95327,95332,95409-95410,95422,95426,95436,95442,95458,95467-95468,95470,95475,95493,95521,95525,95540,95562,95570,95597,95601,95608,95627,95647-95648,95651-95653,95655-95656,95659,95663,95674,95790,95812,95855,95899,95999,96087,96180,96227-96228,96286,96297,96386,96393,96405,96427,96460,96472,96509,96522,96606,96643,96645,96655,96659,96687,96760,96762,96764-96765,96775,96810,96825,96829,96833,96964,96998,97141,97143,97177,97296,97298,97362,97365,97381,97515,97551-97552,97575,97607-97608,97622-97623,97625,97634
/trunk/phase3/RELEASE-NOTES-1.19:95655,95999
Modified: branches/REL1_18/phase3/includes/AutoLoader.php
===================================================================
--- branches/REL1_18/phase3/includes/AutoLoader.php 2011-09-20 22:25:54 UTC
(rev 97672)
+++ branches/REL1_18/phase3/includes/AutoLoader.php 2011-09-20 22:36:23 UTC
(rev 97673)
@@ -116,6 +116,7 @@
'HttpRequest' => 'includes/HttpFunctions.old.php',
'IContextSource' => 'includes/RequestContext.php',
'IcuCollation' => 'includes/Collation.php',
+ 'IdentityCollation' => 'includes/Collation.php',
'ImageGallery' => 'includes/ImageGallery.php',
'ImageHistoryList' => 'includes/ImagePage.php',
'ImageHistoryPseudoPager' => 'includes/ImagePage.php',
Property changes on: branches/REL1_18/phase3/includes/AutoLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/AutoLoader.php:51646
/branches/REL1_17/phase3/includes/AutoLoader.php:81448
/branches/new-installer/phase3/includes/AutoLoader.php:43664-66004
/branches/sqlite/includes/AutoLoader.php:58211-58321
/branches/uploadwizard/phase3/includes/AutoLoader.php:73550-75905
/branches/wmf-deployment/includes/AutoLoader.php:53381
/trunk/phase3/includes/AutoLoader.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93382-93383,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235-94236,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,95171,95409,95436,95458,95467,95470,95475,95493,95521,95525,95540
+ /branches/REL1_15/phase3/includes/AutoLoader.php:51646
/branches/REL1_17/phase3/includes/AutoLoader.php:81448
/branches/new-installer/phase3/includes/AutoLoader.php:43664-66004
/branches/sqlite/includes/AutoLoader.php:58211-58321
/branches/uploadwizard/phase3/includes/AutoLoader.php:73550-75905
/branches/wmf-deployment/includes/AutoLoader.php:53381
/trunk/phase3/includes/AutoLoader.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93382-93383,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235-94236,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,95171,95409,95436,95458,95467,95470,95475,95493,95521,95525,95540,96760,96765,96810,97551-97552,97575,97607-97608,97622-97623,97625,97634
Modified: branches/REL1_18/phase3/includes/Collation.php
===================================================================
--- branches/REL1_18/phase3/includes/Collation.php 2011-09-20 22:25:54 UTC
(rev 97672)
+++ branches/REL1_18/phase3/includes/Collation.php 2011-09-20 22:36:23 UTC
(rev 97673)
@@ -23,6 +23,8 @@
switch( $collationName ) {
case 'uppercase':
return new UppercaseCollation;
+ case 'identity':
+ return new IdentityCollation;
case 'uca-default':
return new IcuCollation( 'root' );
default:
@@ -99,6 +101,30 @@
}
}
+/**
+ * Collation class that's essentially a no-op.
+ *
+ * Does sorting based on binary value of the string.
+ * Like how things were pre 1.17.
+ */
+class IdentityCollation extends Collation {
+
+ function getSortKey( $string ) {
+ return $string;
+ }
+
+ function getFirstLetter( $string ) {
+ global $wgContLang;
+ // Copied from UppercaseCollation.
+ // I'm kind of unclear on when this could happen...
+ if ( $string[0] == "\0" ) {
+ $string = substr( $string, 1 );
+ }
+ return $wgContLang->firstChar( $string );
+ }
+}
+
+
class IcuCollation extends Collation {
var $primaryCollator, $mainCollator, $locale;
var $firstLetterData;
Modified: branches/REL1_18/phase3/includes/DefaultSettings.php
===================================================================
--- branches/REL1_18/phase3/includes/DefaultSettings.php 2011-09-20
22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/includes/DefaultSettings.php 2011-09-20
22:36:23 UTC (rev 97673)
@@ -4796,6 +4796,8 @@
*
* - uppercase: Converts the category name to upper case, and sorts by that.
*
+ * - identity: Does no conversion. Sorts by binary value of the string.
+ *
* - uca-default: Provides access to the Unicode Collation Algorithm with
* the default element table. This is a compromise collation which sorts
* all languages in a mediocre way. However, it is better than "uppercase".
@@ -4809,7 +4811,7 @@
* the sort keys in the database.
*
* Extensions can define there own collations by subclassing Collation
- * and using the class name as the value of this variable.
+ * and using the Collation::factory hook.
*/
$wgCategoryCollation = 'uppercase';
Modified: branches/REL1_18/phase3/includes/OutputPage.php
===================================================================
--- branches/REL1_18/phase3/includes/OutputPage.php 2011-09-20 22:25:54 UTC
(rev 97672)
+++ branches/REL1_18/phase3/includes/OutputPage.php 2011-09-20 22:36:23 UTC
(rev 97673)
@@ -2902,10 +2902,10 @@
/**
* Adds inline CSS styles
* @param $style_css Mixed: inline CSS
- * @param $flip Boolean: Whether to flip the CSS if needed
+ * @param $flip False or String: Set to 'flip' to flip the CSS if needed
*/
public function addInlineStyle( $style_css, $flip = false ) {
- if( $flip && $this->getLang()->isRTL() ) {
+ if( $flip === 'flip' && $this->getLang()->isRTL() ) {
# If wanted, and the interface is right-to-left, flip
the CSS
$style_css = CSSJanus::transform( $style_css, true,
false );
}
Property changes on: branches/REL1_18/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/REL1_17/phase3/includes/OutputPage.php:81445
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:92551-92552,92560,92563-92564,92568,92570,92573-92574,92576,92580-92581,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93288,93382-93383,93516-93518,93557,93818-93822,93847,93858,93891,93935-93936,94068,94155,94212,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94728,94737-94738,94825,94862,94990,94995-94997,95000-95002,95006-95007,95010-95011,95023,95072-95073,95171,95327,95409,95422,95426,95436,95458,95467,95470,95475,95493,95521,95525,95540,95601,95655,95894,96227,96261,96263,96384,96386,96393,96405,96427,96460,96472,97159
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/REL1_17/phase3/includes/OutputPage.php:81445
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:92551-92552,92560,92563-92564,92568,92570,92573-92574,92576,92580-92581,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93288,93382-93383,93516-93518,93557,93818-93822,93847,93858,93891,93935-93936,94068,94155,94212,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94728,94737-94738,94825,94862,94990,94995-94997,95000-95002,95006-95007,95010-95011,95023,95072-95073,95171,95327,95409,95422,95426,95436,95458,95467,95470,95475,95493,95521,95525,95540,95601,95655,95894,96227,96261,96263,96384,96386,96393,96405,96427,96460,96472,96760,96765,96810,97159,97551-97552,97575,97607-97608,97622-97623,97625,97634
Modified: branches/REL1_18/phase3/includes/installer/MysqlUpdater.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/MysqlUpdater.php 2011-09-20
22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/includes/installer/MysqlUpdater.php 2011-09-20
22:36:23 UTC (rev 97673)
@@ -162,7 +162,6 @@
// 1.17
array( 'addTable', 'iwlinks',
'patch-iwlinks.sql' ),
- array( 'addTable', 'user_former_groups',
'patch-user_former_groups.sql'),
array( 'addIndex', 'iwlinks', 'iwl_prefix_title_from',
'patch-rename-iwl_prefix.sql' ),
array( 'addField', 'updatelog', 'ul_value',
'patch-ul_value.sql' ),
array( 'addField', 'interwiki', 'iw_api',
'patch-iw_api_and_wikiid.sql' ),
@@ -181,7 +180,8 @@
array( 'doUserNewTalkTimestampNotNull' ),
array( 'addIndex', 'user', 'user_email',
'patch-user_email_index.sql' ),
array( 'modifyField', 'user_properties', 'up_property',
'patch-up_property.sql' ),
- array( 'addTable', 'uploadstash',
'patch-uploadstash.sql' ),
+ array( 'addTable', 'uploadstash',
'patch-uploadstash.sql' ),
+ array( 'addTable', 'user_former_groups',
'patch-user_former_groups.sql'),
);
}
Modified: branches/REL1_18/phase3/includes/installer/SqliteUpdater.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/SqliteUpdater.php
2011-09-20 22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/includes/installer/SqliteUpdater.php
2011-09-20 22:36:23 UTC (rev 97673)
@@ -42,8 +42,7 @@
array( 'sqliteSetupSearchindex' ),
// 1.17
- array( 'addTable', 'iwlinks',
'patch-iwlinks.sql' ),
- array( 'addTable', 'user_former_groups',
'patch-user_former_groups.sql'),
+ array( 'addTable', 'user_former_groups',
'patch-user_former_groups.sql'),
array( 'addIndex', 'iwlinks',
'iwl_prefix_title_from', 'patch-rename-iwl_prefix.sql' ),
array( 'addField', 'updatelog', 'ul_value',
'patch-ul_value.sql' ),
array( 'addField', 'interwiki', 'iw_api',
'patch-iw_api_and_wikiid.sql' ),
@@ -58,7 +57,8 @@
// 1.18
array( 'addIndex', 'user', 'user_email',
'patch-user_email_index.sql' ),
- array( 'addTable', 'uploadstash',
'patch-uploadstash.sql' ),
+ array( 'addTable', 'uploadstash',
'patch-uploadstash.sql' ),
+ array( 'addTable', 'user_former_groups',
'patch-user_former_groups.sql'),
);
}
Modified: branches/REL1_18/phase3/includes/profiler/Profiler.php
===================================================================
--- branches/REL1_18/phase3/includes/profiler/Profiler.php 2011-09-20
22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/includes/profiler/Profiler.php 2011-09-20
22:36:23 UTC (rev 97673)
@@ -13,7 +13,7 @@
*/
function wfProfileIn( $functionname ) {
global $wgProfiler;
- if ( isset( $wgProfiler['class'] ) ) {
+ if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) )
{
Profiler::instance()->profileIn( $functionname );
}
}
@@ -24,7 +24,7 @@
*/
function wfProfileOut( $functionname = 'missing' ) {
global $wgProfiler;
- if ( isset( $wgProfiler['class'] ) ) {
+ if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) )
{
Profiler::instance()->profileOut( $functionname );
}
}
Modified:
branches/REL1_18/phase3/includes/resourceloader/ResourceLoaderContext.php
===================================================================
--- branches/REL1_18/phase3/includes/resourceloader/ResourceLoaderContext.php
2011-09-20 22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/includes/resourceloader/ResourceLoaderContext.php
2011-09-20 22:36:23 UTC (rev 97673)
@@ -73,6 +73,8 @@
*/
public static function expandModuleNames( $modules ) {
$retval = array();
+ // For backwards compatibility with an earlier hack, replace !
with .
+ $modules = str_replace( '!', '.', $modules );
$exploded = explode( '|', $modules );
foreach ( $exploded as $group ) {
if ( strpos( $group, ',' ) === false ) {
Modified: branches/REL1_18/phase3/maintenance/deleteBatch.php
===================================================================
--- branches/REL1_18/phase3/maintenance/deleteBatch.php 2011-09-20 22:25:54 UTC
(rev 97672)
+++ branches/REL1_18/phase3/maintenance/deleteBatch.php 2011-09-20 22:36:23 UTC
(rev 97673)
@@ -87,8 +87,10 @@
if ( $page->getNamespace() == NS_FILE ) {
$art = new ImagePage( $page );
$img = wfFindFile( $art->mTitle );
- if ( !$img || !$img->delete( $reason ) ) {
- $this->output( "FAILED to delete image
file... " );
+ if ( !$img
+ || !$img->isLocal()
+ || !$img->delete( $reason ) ) {
+ $this->output( " FAILED to delete image
file... " );
}
} else {
$art = new Article( $page );
@@ -96,7 +98,7 @@
$success = $art->doDeleteArticle( $reason );
$dbw->commit();
if ( $success ) {
- $this->output( "\n" );
+ $this->output( " Deleted!\n" );
} else {
$this->output( " FAILED to delete article\n" );
}
Modified: branches/REL1_18/phase3/resources/mediawiki/mediawiki.js
===================================================================
--- branches/REL1_18/phase3/resources/mediawiki/mediawiki.js 2011-09-20
22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/resources/mediawiki/mediawiki.js 2011-09-20
22:36:23 UTC (rev 97673)
@@ -1064,6 +1064,23 @@
return null;
};
+ /**
+ * Get names of all registered modules.
+ *
+ * @return {Array}
+ */
+ this.getModuleNames = function() {
+ var names = $.map( registry, function( i, key ) {
+ return key;
+ } );
+ return names;
+ };
+
+ /**
+ * For backwards-compatibility with Squid-cached pages. Loads
mw.user
+ */
+ this.go = function() { mw.loader.load( 'mediawiki.user' ); };
+
/* Cache document ready status */
$(document).ready( function() { ready = true; } );
Modified: branches/REL1_18/phase3/skins/CologneBlue.php
===================================================================
--- branches/REL1_18/phase3/skins/CologneBlue.php 2011-09-20 22:25:54 UTC
(rev 97672)
+++ branches/REL1_18/phase3/skins/CologneBlue.php 2011-09-20 22:36:23 UTC
(rev 97673)
@@ -44,7 +44,7 @@
$rules[] = "/* @noflip */body>#quickbar { position:
fixed; right: 4px; top: 4px; overflow: auto; bottom:4px;}"; # Hides from IE
}
$style = implode( "\n", $rules );
- $out->addInlineStyle( $style, /* flip css if RTL */true );
+ $out->addInlineStyle( $style, 'flip' );
}
}
Modified: branches/REL1_18/phase3/skins/MonoBook.php
===================================================================
--- branches/REL1_18/phase3/skins/MonoBook.php 2011-09-20 22:25:54 UTC (rev
97672)
+++ branches/REL1_18/phase3/skins/MonoBook.php 2011-09-20 22:36:23 UTC (rev
97673)
@@ -36,10 +36,10 @@
}
// TODO: Migrate all of these
- //$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE
5.5000' );
- //$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE
5.5000' );
- //$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
- //$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
+ $out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE
5.5000' );
+ $out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000'
);
+ $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
+ $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
}
}
Modified: branches/REL1_18/phase3/skins/Simple.php
===================================================================
--- branches/REL1_18/phase3/skins/Simple.php 2011-09-20 22:25:54 UTC (rev
97672)
+++ branches/REL1_18/phase3/skins/Simple.php 2011-09-20 22:36:23 UTC (rev
97673)
@@ -42,7 +42,7 @@
$rules[] = "a.stub:after { $underline; }";
}
$style = implode( "\n", $rules );
- $out->addInlineStyle( $style, /* flip css if RTL */true );
+ $out->addInlineStyle( $style, 'flip' );
}
}
Modified: branches/REL1_18/phase3/skins/Standard.php
===================================================================
--- branches/REL1_18/phase3/skins/Standard.php 2011-09-20 22:25:54 UTC (rev
97672)
+++ branches/REL1_18/phase3/skins/Standard.php 2011-09-20 22:36:23 UTC (rev
97673)
@@ -27,20 +27,20 @@
if ( 2 == $qb ) { # Right
$rules[] = "/* @noflip */#quickbar { position:
absolute; top: 4px; right: 4px; border-left: 2px solid #000000; }";
- $rules[] = "/* @noflip */#article, /* @noflip
*/#mw-data-after-content { margin-left: 4px; margin-right: 152px; }";
+ $rules[] = "/* @noflip */#article,
#mw-data-after-content { margin-left: 4px; margin-right: 152px; }";
} elseif ( 1 == $qb || 3 == $qb ) {
$rules[] = "/* @noflip */#quickbar { position:
absolute; top: 4px; left: 4px; border-right: 1px solid gray; }";
- $rules[] = "/* @noflip */#article, /* @noflip
*/#mw-data-after-content { margin-left: 152px; margin-right: 4px; }";
+ $rules[] = "/* @noflip */#article,
#mw-data-after-content { margin-left: 152px; margin-right: 4px; }";
if( 3 == $qb ) {
$rules[] = "/* @noflip */#quickbar { position:
fixed; padding: 4px; }";
}
} elseif ( 4 == $qb ) {
$rules[] = "/* @noflip */#quickbar { position: fixed;
right: 0px; top: 0px; padding: 4px;}";
$rules[] = "/* @noflip */#quickbar { border-right: 1px
solid gray; }";
- $rules[] = "/* @noflip */#article, /* @noflip
*/#mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
+ $rules[] = "/* @noflip */#article,
#mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
}
$style = implode( "\n", $rules );
- $out->addInlineStyle( $style, /* flip css if RTL */true );
+ $out->addInlineStyle( $style, 'flip' );
}
}
Modified: branches/REL1_18/phase3/skins/common/shared.css
===================================================================
--- branches/REL1_18/phase3/skins/common/shared.css 2011-09-20 22:25:54 UTC
(rev 97672)
+++ branches/REL1_18/phase3/skins/common/shared.css 2011-09-20 22:36:23 UTC
(rev 97673)
@@ -732,6 +732,13 @@
margin: 0 2em 0 0;
}
+#toc #toctitle,
+.toc #toctitle,
+#toc .toctitle,
+.toc .toctitle {
+ direction: ltr;
+}
+
/* tooltip styles */
.mw-help-field-hint {
display: none;
Modified: branches/REL1_18/phase3/skins/monobook/IE70Fixes.css
===================================================================
--- branches/REL1_18/phase3/skins/monobook/IE70Fixes.css 2011-09-20
22:25:54 UTC (rev 97672)
+++ branches/REL1_18/phase3/skins/monobook/IE70Fixes.css 2011-09-20
22:36:23 UTC (rev 97673)
@@ -9,6 +9,9 @@
height: 1%;
}
+.rtl div#column-content div#content { margin-right: 12.2em; margin-left: 0; }
+
+
.rtl div#column-one {
/* For some reason it tries to inherit the padding-top into every div,
* and I can't figure out how to get it back off.
@@ -18,9 +21,13 @@
margin-top: 160px;
}
-.rtl #bodyContent a.external {
- background-image: url(external-rtl.png);
- padding: 0 13px 0 0;
+/* These elements also have padding-left: 20px; in main.css, but in RTL mode
this is flipped.
+ * That's good in normal browsers, but in IE7 it needs to not be flipped for
some daft reason.
+ * Also clear the right margin (originally margin-left: 1em)
+ */
+li#pt-userpage, li#pt-anonuserpage, li#pt-login {
+ padding-left: 20px;
+ margin-right: 0;
}
.rtl a.feedlink {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
