dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8ed712
)
Move search check before title canonicalness check so search works again
author
Brion Vibber
<brion@users.mediawiki.org>
Sat, 31 Jan 2004 05:02:25 +0000
(
05:02
+0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Sat, 31 Jan 2004 05:02:25 +0000
(
05:02
+0000)
wiki.phtml
patch
|
blob
|
history
diff --git
a/wiki.phtml
b/wiki.phtml
index
fa03740
..
ba5e282
100644
(file)
--- a/
wiki.phtml
+++ b/
wiki.phtml
@@
-52,7
+52,13
@@
if ( "" == $title && "delete" != $action ) {
}
wfProfileOut( "main-misc-setup" );
}
wfProfileOut( "main-misc-setup" );
-if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
+if ( "" != $search ) {
+ if($go) {
+ wfGo( $search );
+ } else {
+ wfSearch( $search );
+ }
+} else if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
} else if ( $wgTitle->getPrefixedDBKey() != $title ) {
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
} else if ( $wgTitle->getPrefixedDBKey() != $title ) {
@@
-60,12
+66,6
@@
if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" )
$wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
} else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
wfSpecialPage();
$wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
} else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
wfSpecialPage();
-} else if ( "" != $search ) {
- if($go) {
- wfGo( $search );
- } else {
- wfSearch( $search );
- }
} else {
if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
$wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );
} else {
if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
$wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );