X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=index.php;h=27b7fb988a17fae37d33086bae878d580d36cd1a;hb=8e35c6da67bdfd8f38d612cde2e76a62f57d9d6b;hp=bc82eaf4bce2f59b60fd9246391eee38d671f514;hpb=e76fa905e33ae5c261a65736a2b9614007f6e975;p=lhc%2Fweb%2Fwiklou.git
diff --git a/index.php b/index.php
index bc82eaf4bc..27b7fb988a 100644
--- a/index.php
+++ b/index.php
@@ -1,23 +1,31 @@
-
+
MediaWiki <?php echo $wgVersion ?>
-
-
+
+
- 
-
+ 
+
MediaWiki
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 );
}
@@ -169,6 +172,7 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
case 'info':
case 'markpatrolled':
case 'validate':
+ case 'render':
$wgArticle->$action();
break;
case 'print':
@@ -200,20 +204,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 +241,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' );
}
}