From 7eaaa7f7f5abe36d5611e88f41a6a37d423ba10f Mon Sep 17 00:00:00 2001 From: Arne Heizmann Date: Wed, 1 Sep 2004 02:57:26 +0000 Subject: [PATCH] remove trailing white space (sorry) --- includes/Article.php | 42 +++++++++++++++++++++--------------------- languages/Language.php | 10 +++++----- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 9530bd02df..c0e0b8e496 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -360,7 +360,7 @@ class Article { $id = $this->getID(); if ( 0 == $id ) return; - $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname, + $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname, $this->getSelectOptions() ); if ( $s === false ) { return; @@ -386,7 +386,7 @@ class Article { } $rid = $rt->getArticleID(); if ( 0 != $rid ) { - $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(), + $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $rid ), $fname, $this->getSelectOptions() ); if ( $redirRow !== false ) { @@ -408,7 +408,7 @@ class Article { $this->mTitle->mRestrictions = explode( ',', trim( $s->cur_restrictions ) ); $this->mTitle->mRestrictionsLoaded = true; } else { # oldid set, retrieve historical version - $s = $dbr->getArray( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ), + $s = $dbr->getArray( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ), $fname, $this->getSelectOptions() ); if ( $s === false ) { return; @@ -450,7 +450,7 @@ class Article { return false; } - $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), + $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname, $this->getSelectOptions() ); if ( $s === false ) { return false; @@ -463,7 +463,7 @@ class Article { if( $rt && $rt->getInterwiki() == '' && $rt->getNamespace() != NS_SPECIAL ) { $rid = $rt->getArticleID(); if ( 0 != $rid ) { - $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(), + $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $rid ), $fname, $this->getSelectOptions() ); if ( $redirRow !== false ) { @@ -485,7 +485,7 @@ class Article { $this->mTitle->mRestrictions = explode( ',', trim( $s->cur_restrictions ) ); $this->mTitle->mRestrictionsLoaded = true; } else { # oldid set, retrieve historical version - $s = $dbr->selectRow( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ), + $s = $dbr->selectRow( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ), $fname, $this->getSelectOptions() ); if ( $s === false ) { return false; @@ -505,7 +505,7 @@ class Article { function forUpdate( $x = NULL ) { return wfSetVar( $this->mForUpdate, $x ); } - + # Get the database which should be used for reads function &getDB() { if ( $this->mForUpdate ) { @@ -524,10 +524,10 @@ class Article { } else { $options = 'FOR UPDATE'; } - } + } return $options; } - + function getID() { if( $this->mTitle ) { return $this->mTitle->getArticleID(); @@ -540,7 +540,7 @@ class Article { if ( -1 == $this->mCounter ) { $id = $this->getID(); $dbr =& $this->getDB(); - $this->mCounter = $dbr->selectField( 'cur', 'cur_counter', 'cur_id='.$id, + $this->mCounter = $dbr->selectField( 'cur', 'cur_counter', 'cur_id='.$id, 'Article::getCount', $this->getSelectOptions() ); } return $this->mCounter; @@ -631,7 +631,7 @@ class Article { $sql .= ' '. $this->getSelectOptions(); $res = $dbr->query($sql, $fname); - + while ( $line = $dbr->fetchObject( $res ) ) { $contribs[] = array($line->old_user, $line->old_user_text, $line->user_real_name); } @@ -764,7 +764,7 @@ class Article { # Add link titles as META keywords $wgOut->addMetaTags() ; - + $this->viewUpdates(); wfProfileOut( $fname ); } @@ -833,7 +833,7 @@ class Article { # The talk page isn't in the regular link tables, so we need to update manually: $talkns = $ns ^ 1; # talk -> normal; normal -> talk - $dbw->updateArray( 'cur', array('cur_touched' => $dbw->timestamp($now) ), + $dbw->updateArray( 'cur', array('cur_touched' => $dbw->timestamp($now) ), array( 'cur_namespace' => $talkns, 'cur_title' => $ttl ), $fname ); # standard deferred updates @@ -1137,7 +1137,7 @@ class Article { # Add this page to my watchlist - + function watch( $add = true ) { global $wgUser, $wgOut, $wgLang; global $wgDeferredUpdateList; @@ -1225,7 +1225,7 @@ class Article { } # Output protection confirmation dialog - + function confirmProtect( $par, $reason, $limit = 'sysop' ) { global $wgOut; @@ -1294,7 +1294,7 @@ class Article { } # UI entry point for page deletion - + function delete() { global $wgUser, $wgOut, $wgMessageCache, $wgRequest; $fname = 'Article::delete'; @@ -1402,7 +1402,7 @@ class Article { } # Output deletion confirmation dialog - + function confirmDelete( $par, $reason ) { global $wgOut; @@ -1455,7 +1455,7 @@ class Article { # Perform a deletion and output success or failure messages - + function doDelete( $reason ) { global $wgOut, $wgUser, $wgLang; $fname = 'Article::doDelete'; @@ -1998,7 +1998,7 @@ class Article { if ($exists < 1) { $wgOut->addHTML( wfMsg('noarticletext') ); } else { - $numwatchers = $dbr->selectField( 'watchlist', 'COUNT(*)', $wl_clause, $fname, + $numwatchers = $dbr->selectField( 'watchlist', 'COUNT(*)', $wl_clause, $fname, $this->getSelectOptions() ); $wgOut->addHTML( "' ); diff --git a/languages/Language.php b/languages/Language.php index 299a0173c2..57d8995178 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1369,15 +1369,15 @@ title. Please merge them manually.', 'export' => 'Export pages', 'exporttext' => 'You can export the text and editing history of a particular page or -set of pages wrapped in some XML. In the future, this may then be imported into another -wiki running MediaWiki software, although there is no support for this feature in the +set of pages wrapped in some XML. In the future, this may then be imported into another +wiki running MediaWiki software, although there is no support for this feature in the current version. -To export article pages, enter the titles in the text box below, one title per line, and -select whether you want the current version as well as all old versions, with the page +To export article pages, enter the titles in the text box below, one title per line, and +select whether you want the current version as well as all old versions, with the page history lines, or just the current version with the info about the last edit. -In the latter case you can also use a link, e.g. [[{{ns:Special}}:Export/Train]] for the +In the latter case you can also use a link, e.g. [[{{ns:Special}}:Export/Train]] for the article [[Train]]. ', 'exportcuronly' => 'Include only the current revision, not the full history', -- 2.20.1