Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

whitespaces killing

Browse source
This commit is contained in:
Antoine Musso 2007-01-20 12:59:34 +00:00
parent 52d2e48d27
commit 1fc273e40a
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
includes/Wiki.php
View file

@ -7,14 +7,14 @@ class MediaWiki {
var $GET; /* Stores the $_GET variables at time of creation, can be changed */ var $GET; /* Stores the $_GET variables at time of creation, can be changed */
var $params = array(); var $params = array();
/** /**
* Constructor * Constructor
*/ */
function MediaWiki () { function MediaWiki () {
$this->GET = $_GET; $this->GET = $_GET;
} }
/** /**
* Stores key/value pairs to circumvent global variables * Stores key/value pairs to circumvent global variables
* Note that keys are case-insensitive! * Note that keys are case-insensitive!
@ -23,7 +23,7 @@ class MediaWiki {
$key = strtolower( $key ); $key = strtolower( $key );
$this->params[$key] =& $value; $this->params[$key] =& $value;
} }
/** /**
* Retrieves key/value pairs to circumvent global variables * Retrieves key/value pairs to circumvent global variables
* Note that keys are case-insensitive! * Note that keys are case-insensitive!
@ -35,7 +35,7 @@ class MediaWiki {
} }
return $default; return $default;
} }
/** /**
* Initialization of ... everything * Initialization of ... everything
@return Article either the object to become $wgArticle, or NULL @return Article either the object to become $wgArticle, or NULL
@ -57,7 +57,7 @@ class MediaWiki {
wfProfileOut( 'MediaWiki::initialize' ); wfProfileOut( 'MediaWiki::initialize' );
return $article; return $article;
} }
/** /**
* Checks some initial queries * Checks some initial queries
* Note that $title here is *not* a Title object, but a string! * Note that $title here is *not* a Title object, but a string!
@ -66,10 +66,10 @@ class MediaWiki {
if ($request->getVal( 'printable' ) == 'yes') { if ($request->getVal( 'printable' ) == 'yes') {
$output->setPrintable(); $output->setPrintable();
} }
$ret = NULL ; $ret = NULL ;
if ( '' == $title && 'delete' != $action ) { if ( '' == $title && 'delete' != $action ) {
$ret = Title::newMainPage(); $ret = Title::newMainPage();
} elseif ( $curid = $request->getInt( 'curid' ) ) { } elseif ( $curid = $request->getInt( 'curid' ) ) {
@ -82,19 +82,19 @@ class MediaWiki {
*/ */
if( count($lang->getVariants()) > 1 && !is_null($ret) && $ret->getArticleID() == 0 ) if( count($lang->getVariants()) > 1 && !is_null($ret) && $ret->getArticleID() == 0 )
$lang->findVariantLink( $title, $ret ); $lang->findVariantLink( $title, $ret );
} }
return $ret ; return $ret ;
} }
/** /**
* Checks for search query and anon-cannot-read case * Checks for search query and anon-cannot-read case
*/ */
function preliminaryChecks ( &$title, &$output, $request ) { function preliminaryChecks ( &$title, &$output, $request ) {
# Debug statement for user levels # Debug statement for user levels
// print_r($wgUser); // print_r($wgUser);
$search = $request->getText( 'search' ); $search = $request->getText( 'search' );
if( !is_null( $search ) && $search !== '' ) { if( !is_null( $search ) && $search !== '' ) {
// Compatibility with old search URLs which didn't use Special:Search // Compatibility with old search URLs which didn't use Special:Search
@ -111,16 +111,16 @@ class MediaWiki {
$output->output(); $output->output();
exit; exit;
} }
} }
/** /**
* Initialize the object to be known as $wgArticle for special cases * Initialize the object to be known as $wgArticle for special cases
*/ */
function initializeSpecialCases ( &$title, &$output, $request ) { function initializeSpecialCases ( &$title, &$output, $request ) {
global $wgRequest; global $wgRequest;
wfProfileIn( 'MediaWiki::initializeSpecialCases' ); wfProfileIn( 'MediaWiki::initializeSpecialCases' );
$search = $this->getVal('Search'); $search = $this->getVal('Search');
$action = $this->getVal('Action'); $action = $this->getVal('Action');
if( !$this->getVal('DisableInternalSearch') && !is_null( $search ) && $search !== '' ) { if( !$this->getVal('DisableInternalSearch') && !is_null( $search ) && $search !== '' ) {
@ -156,7 +156,7 @@ class MediaWiki {
"This means the wiki got confused about what page was " . "This means the wiki got confused about what page was " .
"requested; this sometimes happens when moving a wiki " . "requested; this sometimes happens when moving a wiki " .
"to a new server or changing the server configuration.\n\n"; "to a new server or changing the server configuration.\n\n";
if( $wgUsePathInfo ) { if( $wgUsePathInfo ) {
$message .= "The wiki is trying to interpret the page " . $message .= "The wiki is trying to interpret the page " .
"title from the URL path portion (PATH_INFO), which " . "title from the URL path portion (PATH_INFO), which " .
@ -206,7 +206,7 @@ class MediaWiki {
// FIXME: where should this go? // FIXME: where should this go?
$title = Title::makeTitle( NS_IMAGE, $title->getDBkey() ); $title = Title::makeTitle( NS_IMAGE, $title->getDBkey() );
} }
switch( $title->getNamespace() ) { switch( $title->getNamespace() ) {
case NS_IMAGE: case NS_IMAGE:
return new ImagePage( $title ); return new ImagePage( $title );
@ -216,7 +216,7 @@ class MediaWiki {
return new Article( $title ); return new Article( $title );
} }
} }
/** /**
* Initialize the object to be known as $wgArticle for "standard" actions * Initialize the object to be known as $wgArticle for "standard" actions
* Create an Article object for the page, following redirects if needed. * Create an Article object for the page, following redirects if needed.
@ -228,17 +228,17 @@ class MediaWiki {
function initializeArticle( $title, $request ) { function initializeArticle( $title, $request ) {
global $wgTitle; global $wgTitle;
wfProfileIn( 'MediaWiki::initializeArticle' ); wfProfileIn( 'MediaWiki::initializeArticle' );
$action = $this->getVal('Action'); $action = $this->getVal('Action');
$article = $this->articleFromTitle( $title ); $article = $this->articleFromTitle( $title );
// Namespace might change when using redirects // Namespace might change when using redirects
if( $action == 'view' && !$request->getVal( 'oldid' ) && if( $action == 'view' && !$request->getVal( 'oldid' ) &&
$request->getVal( 'redirect' ) != 'no' ) { $request->getVal( 'redirect' ) != 'no' ) {
$dbr =& wfGetDB(DB_SLAVE); $dbr =& wfGetDB(DB_SLAVE);
$article->loadPageData($article->pageDataFromTitle($dbr, $title)); $article->loadPageData($article->pageDataFromTitle($dbr, $title));
/* Follow redirects only for... redirects */ /* Follow redirects only for... redirects */
if ($article->mIsRedirect) { if ($article->mIsRedirect) {
$target = $article->followRedirect(); $target = $article->followRedirect();
@ -307,7 +307,7 @@ class MediaWiki {
*/ */
function doJobs() { function doJobs() {
global $wgJobRunRate; global $wgJobRunRate;
if ( $wgJobRunRate <= 0 || wfReadOnly() ) { if ( $wgJobRunRate <= 0 || wfReadOnly() ) {
return; return;
} }
@ -335,7 +335,7 @@ class MediaWiki {
wfDebugLog( 'jobqueue', $output ); wfDebugLog( 'jobqueue', $output );
} }
} }
/** /**
* Ends this task peacefully * Ends this task peacefully
*/ */
@ -439,7 +439,6 @@ class MediaWiki {
} }
wfProfileOut( 'MediaWiki::performAction' ); wfProfileOut( 'MediaWiki::performAction' );
} }
}; /* End of class MediaWiki */ }; /* End of class MediaWiki */