Ugly fix for skins that dont extends Skin:specialPagesList such as Nostalgia. Pointed...

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index c9e4650..1b35625 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1,18 +1,17 @@
 <?php
+# See skin.doc
 
-require_once( 'Feed.php' );
+require_once( 'Feed.php' );  // should not be called if the actual page isn't feed enabled
 require_once( 'Image.php' );
 
-# See skin.doc
-
 # These are the INTERNAL names, which get mapped
 # directly to class names.  For display purposes, the
 # Language class has internationalized names
 #
 /* private */ $wgValidSkinNames = array(
-       'standard' => 'Standard',
-       'nostalgia' => 'Nostalgia',
-       'cologneblue' => 'CologneBlue'
+       'standard'              => 'Standard',
+       'nostalgia'             => 'Nostalgia',
+       'cologneblue'   => 'CologneBlue'
 );
 if( $wgUsePHPTal ) {
     #$wgValidSkinNames[] = 'PHPTal';
@@ -170,16 +169,14 @@ class Skin {
                global $wgOut, $wgStylePath, $wgLang, $wgUser, $wgRequest, $wgTitle;
                $sheet = $this->getStylesheet();
                $action = $wgRequest->getText('action');
-               $s = "@import url(\"$wgStylePath/$sheet\");\n";
-               if($wgLang->isRTL()) $s .= "@import url(\"$wgStylePath/common_rtl.css\");\n";
+               $s = "@import \"$wgStylePath/$sheet\";\n";
+               if($wgLang->isRTL()) $s .= "@import \"$wgStylePath/common_rtl.css\";\n";
                if( $wgUser->getID() != 0 ) { # logged in       
                        if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
-                               $s .= '@import url('.$this->makeUrl('-','action=raw&gen=css&smaxage=0&maxage=0').');'."\n";
                                $s .= $wgRequest->getText('wpTextbox1');
                        } else {
-                               $s .= '@import url('.$this->makeUrl('-','action=raw&gen=css&smaxage=0&maxage=0').');'."\n";
                                $userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
-                               $s.= '@import url("'.$this->makeUrl($userpage.'/'.$this->getSkinName(), 'action=raw&ctype=text/css').'");'."\n";
+                               $s.= '@import "'.$this->makeUrl($userpage.'/'.$this->getSkinName().'.css', 'action=raw&ctype=text/css').'";'."\n";
                        }
                }
                $s .= $this->doGetUserStyles();
@@ -404,7 +401,7 @@ class Skin {
                if($wgUseCategoryBrowser) {
                        $s .= '<br/><hr/>';
                        $catstack = array();
-                       $s.= $wgTitle->getAllParentCategories(&$catstack);
+                       $s.= $wgTitle->getAllParentCategories($catstack);
                }
                
                return $s;
@@ -1087,6 +1084,7 @@ class Skin {
        function specialPagesList()
        {
                global $wgUser, $wgOut, $wgLang, $wgServer, $wgRedirectScript;
+               require_once('SpecialPage.php');
                $a = array();
                $pages = SpecialPage::getPages();
                
@@ -1561,7 +1559,7 @@ class Skin {
        # Pass a title object, not a title string
        function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '')
        {
-               global $wgOut, $wgTitle;
+               global $wgOut, $wgTitle, $wgInputEncoding;
 
                $fname = 'Skin::makeKnownLinkObj';
                wfProfileIn( $fname );
@@ -1577,7 +1575,12 @@ class Skin {
                        $u = $nt->escapeLocalURL( $query );
                }
                if ( '' != $nt->getFragment() ) {
-                       $u .= '#' . htmlspecialchars( $nt->getFragment() );
+                       $anchor = urlencode( do_html_entity_decode( str_replace(' ', '_', $nt->getFragment()), ENT_COMPAT, $wgInputEncoding ) );
+                       $replacearray = array(
+                               '%3A' => ':',
+                               '%' => '.'
+                       );
+                       $u .= '#' . str_replace(array_keys($replacearray),array_values($replacearray),$anchor);
                }
                if ( '' == $text ) {
                        $text = htmlspecialchars( $nt->getPrefixedText() );
@@ -2137,9 +2140,9 @@ class Skin {
                $rci = 'RCI'.$this->rcCacheIndex ;
                $rcl = 'RCL'.$this->rcCacheIndex ;
                $rcm = 'RCM'.$this->rcCacheIndex ;
-               $toggleLink = 'javascript:toggleVisibility("'.$rci.'","'.$rcm.'","'.$rcl.'")' ;
+               $toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')" ;
                $arrowdir = $wgLang->isRTL() ? 'l' : 'r';
-               $tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/images/Arr_'.$arrowdir.png.'" width="12" height="12" /></a></span>' ;
+               $tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/images/Arr_'.$arrowdir.'.png" width="12" height="12" /></a></span>' ;
                $tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/images/Arr_d.png" width="12" height="12" /></a></span>' ;
                $r .= $tl ;
 
@@ -2493,11 +2496,12 @@ class Skin {
                # is ignored
                while(preg_match('/\[\[(.*?)(\|(.*?))*\]\]/',$comment,$match)) {
 
-                       $medians = $wgLang->getNsText(Namespace::getMedia());
+                       $medians = $wgLang->getNsText(Namespace::getMedia()).':';
                        $func='makeLink';
                        if(preg_match('/^'.$medians.'/i',$match[1])) {
                                $func='makeMediaLink';
                        }
+                       # Handle link renaming [[foo|text]] will show link as "text"
                        if(isset($match[3]) ) {
                                $comment=
                                preg_replace('/\[\[(.*?)\]\]/',
@@ -2593,7 +2597,7 @@ class Skin {
                # try min-width & co when somebody gets a chance
                $hideline = ' <script type="text/javascript">showTocToggle("' . addslashes( wfMsg('showtoc') ) . '","' . addslashes( wfMsg('hidetoc') ) . '")</script>';
                return
-               '<table border="0" id="toc"><tr><td align="center">'."\n".
+               '<table border="0" id="toc"><tr id="toctitle"><td align="center">'."\n".
                '<b>'.wfMsg('toc').'</b>' .
                $hideline .
                '</td></tr><tr id="tocinside"><td>'."\n".
@@ -2758,14 +2762,4 @@ class Skin {
        }
 
 }
-
-require_once( 'SkinStandard.php' );
-require_once( 'SkinNostalgia.php' );
-require_once( 'SkinCologneBlue.php' );
-
-if( $wgUsePHPTal ) {
-       require_once( 'SkinPHPTal.php' );
-}
-
-
 ?>