dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert more minor breakage from missing HTML escaping (broken June 24)
[lhc/web/wiklou.git] / index.php
diff --git a/index.php b/index.php
index 8f6fc3b..c9b09ad 100644 (file)
--- a/index.php
+++ b/index.php
@@ -25,7 +25,7 @@ if( !file_exists( 'LocalSettings.php' ) ) {
        <head>
                <title>MediaWiki <?php echo $wgVersion ?></title>
                <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-               
+
                <style type='text/css' media='screen, projection'>
                        html, body {
                                color: #000;
@@ -41,7 +41,7 @@ if( !file_exists( 'LocalSettings.php' ) ) {
        </head>
        <body>
                <img src='skins/common/images/mediawiki.png' alt='The MediaWiki logo' />
-               
+
                <h1>MediaWiki <?php echo $wgVersion ?></h1>
                <div class='error'>
                <?php
@@ -69,7 +69,6 @@ OutputPage::setEncodings(); # Not really used yet
 $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
-$action = rtrim( $action );
 if ($wgRequest->getVal( 'printable' ) == 'yes') {
        $wgOut->setPrintable();
 }
@@ -81,12 +80,12 @@ if ( '' == $title && 'delete' != $action ) {
        $wgTitle = Title::newFromID( $curid );
 } else {
        $wgTitle = Title::newFromURL( $title );
-       /* check variant links so that interwiki links don't have to worry about 
+       /* check variant links so that interwiki links don't have to worry about
           the possible different language variants
        */
        if( !is_null($wgTitle) && $wgTitle->getArticleID() == 0 )
                $wgContLang->findVariantLink( $title, $wgTitle );
-       
+
 }
 wfProfileOut( 'main-misc-setup' );
 
@@ -103,8 +102,11 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( 'main-action' );
-
 $search = $wgRequest->getText( 'search' );
+if( $wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
+       $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
+}
+
 if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        require_once( 'includes/SpecialSearch.php' );
        $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
@@ -141,14 +143,27 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        }
 
        $ns = $wgTitle->getNamespace();
+
+       // Namespace might change when using redirects
+       if($action == 'view' && !$wgRequest->getVal( 'oldid' ) ) {
+               $wgArticle = new Article( $wgTitle );
+               $rTitle = Title::newFromRedirect( $wgArticle->fetchContent() );
+               if($rTitle) {
+                       # Reload from the page pointed to later
+                       $wgArticle->mContentLoaded = false;
+                       $ns = $rTitle->getNamespace();
+               }
+       }
+
+       // Categories and images are handled by a different class
        if ( $ns == NS_IMAGE ) {
+               unset($wgArticle);
                require_once( 'includes/ImagePage.php' );
                $wgArticle = new ImagePage( $wgTitle );
        } elseif ( $wgUseCategoryMagic && $ns == NS_CATEGORY ) {
+               unset($wgArticle);
                require_once( 'includes/CategoryPage.php' );
                $wgArticle = new CategoryPage( $wgTitle );
-       } else {
-               $wgArticle = new Article( $wgTitle );
        }
 
        if ( in_array( $action, $wgDisabledActions ) ) {
@@ -169,6 +184,8 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
                        case 'info':
                        case 'markpatrolled':
                        case 'validate':
+                       case 'render':
+                       case 'deletetrackback':
                                $wgArticle->$action();
                                break;
                        case 'print':
@@ -200,20 +217,20 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
                                        User::SetupSession();
                                }
                                # Continue...
-                       case 'edit':                    
+                       case 'edit':
                                $internal = $wgRequest->getVal( 'internaledit' );
                                $external = $wgRequest->getVal( 'externaledit' );
                                $section = $wgRequest->getVal( 'section' );
-                               $oldid = $wgRequest->getVal( 'oldid' );                                         
-                               if(!$wgUseExternalEditor || $action=='submit' || $internal || 
+                               $oldid = $wgRequest->getVal( 'oldid' );
+                               if(!$wgUseExternalEditor || $action=='submit' || $internal ||
                                   $section || $oldid || (!$wgUser->getOption('externaleditor') && !$external)) {
                                        require_once( 'includes/EditPage.php' );
                                        $editor = new EditPage( $wgArticle );
-                                       $editor->submit();                              
+                                       $editor->submit();
                                } elseif($wgUseExternalEditor && ($external || $wgUser->getOption('externaleditor'))) {
                                        require_once( 'includes/ExternalEdit.php' );
                                        $mode = $wgRequest->getVal( 'mode' );
-                                       $extedit = new ExternalEdit( $wgArticle, $mode );                               
+                                       $extedit = new ExternalEdit( $wgArticle, $mode );
                                        $extedit->edit();
                                }
                                break;
@@ -237,7 +254,7 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
                                $wgArticle->view();
                                break;
                        default:
-                               if (wfRunHooks('UnknownAction', $action, $wgArticle)) {
+                               if (wfRunHooks('UnknownAction', array($action, $wgArticle))) {
                                        $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
                                }
                }
Wiklou, le Wiki du Wiklou