X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=c808f95b97f79957efdcf421c33eb500a7eca668;hb=054ef12f514e67c7d822ff08d346c72c007e1796;hp=5972935a532dbf98e411d27fe5f1a532221ff7e1;hpb=8c2a0fbb00fc37ac2eec403a0ee23b171a8dedb6;p=lhc%2Fweb%2Fwiklou.git
diff --git a/index.php b/index.php
index 5972935a53..c808f95b97 100644
--- a/index.php
+++ b/index.php
@@ -1,22 +1,30 @@
-
+
MediaWiki <?php echo $wgVersion ?>
-
+
- 
+ 
MediaWiki
@@ -51,13 +59,6 @@ if( !file_exists( 'LocalSettings.php' ) ) {
die();
}
-# Valid web server entry point, enable includes.
-# Please don't move this line to includes/Defines.php. This line essentially defines
-# a valid entry point. If you put it in includes/Defines.php, then any script that includes
-# it becomes an entry point, thereby defeating its purpose.
-define( 'MEDIAWIKI', true );
-
-require_once( './includes/Defines.php' );
require_once( './LocalSettings.php' );
require_once( 'includes/Setup.php' );
@@ -68,7 +69,7 @@ OutputPage::setEncodings(); # Not really used yet
$action = $wgRequest->getVal( 'action', 'view' );
$title = $wgRequest->getVal( 'title' );
-$action = strtolower( trim( $action ) );
+$action = rtrim( $action );
if ($wgRequest->getVal( 'printable' ) == 'yes') {
$wgOut->setPrintable();
}
@@ -80,6 +81,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
+ the possible different language variants
+ */
+ if( !is_null($wgTitle) && $wgTitle->getArticleID() == 0 )
+ $wgContLang->findVariantLink( $title, $wgTitle );
+
}
wfProfileOut( 'main-misc-setup' );
@@ -96,8 +103,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' );
@@ -127,27 +137,20 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
$wgOut->redirect( $wgTitle->getFullURL(), '301');
} else if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
# actions that need to be made when we have a special pages
- require_once( 'includes/SpecialPage.php' );
SpecialPage::executePath( $wgTitle );
} else {
if ( NS_MEDIA == $wgTitle->getNamespace() ) {
$wgTitle = Title::makeTitle( NS_IMAGE, $wgTitle->getDBkey() );
}
- switch( $wgTitle->getNamespace() ) {
- case NS_IMAGE:
+ $ns = $wgTitle->getNamespace();
+ if ( $ns == NS_IMAGE ) {
require_once( 'includes/ImagePage.php' );
$wgArticle = new ImagePage( $wgTitle );
- break;
- case NS_CATEGORY:
- if ( $wgUseCategoryMagic ) {
- require_once( 'includes/CategoryPage.php' );
- $wgArticle = new CategoryPage( $wgTitle );
- break;
- }
- # NO break if wgUseCategoryMagic is false, drop through to next (default).
- # Don't insert other cases between NS_CATEGORY and default.
- default:
+ } elseif ( $wgUseCategoryMagic && $ns == NS_CATEGORY ) {
+ require_once( 'includes/CategoryPage.php' );
+ $wgArticle = new CategoryPage( $wgTitle );
+ } else {
$wgArticle = new Article( $wgTitle );
}
@@ -237,7 +240,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' );
}
}