Self revert, this isn't really implemented right.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e96c2cd..839f87e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -160,7 +160,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14558) New system message (emailuserfooter) is now added to the footer of 
   e-mails sent with Special:Emailuser
 * Add support for Hijri (Islamic) calendar
-* (bug 2889) MediaWiki:Print.css applies to the printable version
   
 === Bug fixes in 1.13 ===
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 86c8c05..3f8c6b9 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -416,7 +416,7 @@ class Skin extends Linker {
 
        # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
        function getUserStylesheet() {
-               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion, $wgOut;
+               global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
                $sheet = $this->getStylesheet();
                $s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
                $s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
@@ -428,8 +428,6 @@ class Skin extends Linker {
                        '@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
 
                $s .= $this->doGetUserStyles();
-               if($wgOut->isPrintable()) $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\";\n"; 
-               else $s .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ) . "\" print;\n"; 
                return $s."\n";
        }
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 5339160..c60cfb4 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -962,8 +962,7 @@ class SkinTemplate extends Skin {
        function setupUserCss() {
                wfProfileIn( __METHOD__ );
 
-               global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, 
-                       $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser, $wgOut;
+               global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
                $sitecss = '';
                $usercss = '';
@@ -1006,8 +1005,6 @@ class SkinTemplate extends Skin {
                        $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n";
                        $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n";
                        $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n";
-                       if( $wgOut->isPrintable()) $sitecss .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI) . '";' . "\n";
-                       else $sitecss .= '@import "' . self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI) . '" print;' . "\n";
                }
 
                # If we use any dynamic CSS, make a little CDATA block out of it.

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e879229..9bcc004 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2669,7 +2669,6 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'chick.css'       => '/* CSS placed here will affect users of the Chick skin */', # only translate this message to other languages if you have to change it
 'simple.css'      => '/* CSS placed here will affect users of the Simple skin */', # only translate this message to other languages if you have to change it
 'modern.css'      => '/* CSS placed here will affect users of the Modern skin */', # only translate this message to other languages if you have to change it
-'print.css'       => '/* CSS placed here will be applied to the printable version */', # only translate this message to other languages if you have to change it
 
 # Scripts
 'common.js'      => '/* Any JavaScript here will be loaded for all users on every page load. */', # only translate this message to other languages if you have to change it

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 008a9b9..da23f94 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -202,7 +202,6 @@ $wgOptionalMessages = array(
        'chick.css',
        'simple.css',
        'modern.css',
-       'print.css',
        'common.js',
        'standard.js',
        'nostalgia.js',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index debf8c5..882f0c0 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1890,7 +1890,6 @@ $wgMessageStructure = array(
                'chick.css',
                'simple.css',
                'modern.css',
-               'print.css',
        ),
        'scripts' => array(
                'common.js',