Only start new session for anon users on submit, not edit

[lhc/web/wiklou.git] / index.php

diff --git a/index.php b/index.php
index 1386b26..dcfbed9 100644 (file)
--- a/index.php
+++ b/index.php
@@ -31,10 +31,6 @@ OutputPage::setEncodings(); # Not really used yet
 $action = $wgRequest->getVal( "action", "view" );
 $title = $wgRequest->getVal( "title" );
 
-# Placeholders in case of DB error
-$wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
-$wgArticle = new Article($wgTitle);
-
 $action = strtolower( trim( $action ) );
 if ($wgRequest->getVal( "printable" ) == "yes") {
        $wgOut->setPrintable();
@@ -63,8 +59,9 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( "main-action" );
+
 $search = $wgRequest->getText( 'search' );
-if( !is_null( $search ) && $search !== '' ) {
+if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        require_once( 'includes/SpecialSearch.php' );
        $wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
        wfSpecialSearch();
@@ -85,6 +82,7 @@ if( !is_null( $search ) && $search !== '' ) {
        !count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
 {
        /* redirect to canonical url, make it a 301 to allow caching */
+       $wgOut->setSquidMaxage( 1200 );
        $wgOut->redirect( $wgTitle->getFullURL(), '301');
 } else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
        # actions that need to be made when we have a special pages
@@ -153,11 +151,13 @@ if( !is_null( $search ) && $search !== '' ) {
                        require_once( "includes/Credits.php" );
                        showCreditsPage( $wgArticle );
                        break;
-               case "edit":
                case "submit":
                        if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {
+                               # Send a cookie so anons get talk message notifications
                                User::SetupSession();
                        }
+                       # Continue...
+               case "edit":
                        require_once( "includes/EditPage.php" );
                        $editor = new EditPage( $wgArticle );
                        $editor->submit();
@@ -182,7 +182,9 @@ if( !is_null( $search ) && $search !== '' ) {
                        $wgArticle->view();
                        break;
                default:
-                       $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+                   if (wfRunHooks('UnknownAction', $action, $wgArticle)) {
+                               $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+                       }
        }
 }
 wfProfileOut( "main-action" );