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

Normalise # to // comments

Browse source
This commit is contained in:
Sam Reed 2010-06-30 15:50:37 +00:00
parent 9fa031a904
commit e7aa688419
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
includes/Wiki.php
View file

@ -114,7 +114,7 @@ class MediaWiki {
}
$ret = null;
if( $curid = $wgRequest->getInt( 'curid' ) ) {
# URLs like this are generated by RC, because rc_title isn't always accurate
// URLs like this are generated by RC, because rc_title isn't always accurate
$ret = Title::newFromID( $curid );
} elseif( $title == '' && $action != 'delete' ) {
$ret = Title::newMainPage();
@ -125,7 +125,7 @@ class MediaWiki {
if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
$wgContLang->findVariantLink( $title, $ret );
}
# For non-special titles, check for implicit titles
// For non-special titles, check for implicit titles
if( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
// We can have urls with just ?diff=,?oldid= or even just ?diff=
$oldid = $wgRequest->getInt( 'oldid' );
@ -156,9 +156,9 @@ class MediaWiki {
// Do this above the read whitelist check for security...
$title = SpecialPage::getTitleFor( 'Search' );
}
# If the user is not logged in, the Namespace:title of the article must be in
# the Read array in order for the user to see it. (We have to check here to
# catch special pages etc. We check again in Article::view())
// If the user is not logged in, the Namespace:title of the article must be in
// the Read array in order for the user to see it. (We have to check here to
// catch special pages etc. We check again in Article::view())
if( !is_null( $title ) && !$title->userCanRead() ) {
global $wgDeferredUpdateList;
$output->loginToUse();
@ -188,10 +188,10 @@ class MediaWiki {
$perferred = $wgContLang->getPreferredVariant( false );
// Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
if( is_null($title) || ( ($title->getDBkey() == '') && ($title->getInterwiki() == '') ) ) {
if( is_null($title) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) {
$title = SpecialPage::getTitleFor( 'Badtitle' );
$output->setTitle( $title ); // bug 21456
# Die now before we mess up $wgArticle and the skin stops working
// Die now before we mess up $wgArticle and the skin stops working
throw new ErrorPageError( 'badtitle', 'badtitletext' );
// Interwiki redirects
@ -310,8 +310,8 @@ class MediaWiki {
$action = $this->getVal( 'action', 'view' );
$article = self::articleFromTitle( $title );
# NS_MEDIAWIKI has no redirects.
# It is also used for CSS/JS, so performance matters here...
// NS_MEDIAWIKI has no redirects.
// It is also used for CSS/JS, so performance matters here...
if( $title->getNamespace() == NS_MEDIAWIKI ) {
wfProfileOut( __METHOD__ );
return $article;
@ -326,7 +326,7 @@ class MediaWiki {
// ... and the article is not a non-redirect image page with associated file
!( is_object( $file ) && $file->exists() && !$file->getRedirected() ) )
{
# Give extensions a change to ignore/handle redirects as needed
// Give extensions a change to ignore/handle redirects as needed
$ignoreRedirect = $target = false;
$dbr = wfGetDB( DB_SLAVE );
@ -338,7 +338,7 @@ class MediaWiki {
// Follow redirects only for... redirects.
// If $target is set, then a hook wanted to redirect.
if( !$ignoreRedirect && ($target || $article->isRedirect()) ) {
# Is the target already set by an extension?
// Is the target already set by an extension?
$target = $target ? $target : $article->followRedirect();
if( is_string( $target ) ) {
if( !$this->getVal( 'DisableHardRedirects' ) ) {
@ -375,13 +375,13 @@ class MediaWiki {
*/
function finalCleanup( &$deferredUpdates, &$output ) {
wfProfileIn( __METHOD__ );
# Now commit any transactions, so that unreported errors after
# output() don't roll back the whole DB transaction
// Now commit any transactions, so that unreported errors after
// output() don't roll back the whole DB transaction
$factory = wfGetLBFactory();
$factory->commitMasterChanges();
# Output everything!
// Output everything!
$output->output();
# Do any deferred jobs
// Do any deferred jobs
$this->doUpdates( $deferredUpdates );
$this->doJobs();
wfProfileOut( __METHOD__ );
@ -407,7 +407,7 @@ class MediaWiki {
foreach( $updates as $up ) {
$up->doUpdate();
# Commit after every update to prevent lock contention
// Commit after every update to prevent lock contention
if( $dbw->trxLevel() ) {
$dbw->commit();
}
@ -454,7 +454,7 @@ class MediaWiki {
*/
function restInPeace() {
wfLogProfilingData();
# Commit and close up!
// Commit and close up!
$factory = wfGetLBFactory();
$factory->commitMasterChanges();
$factory->shutdown();
@ -484,8 +484,8 @@ class MediaWiki {
$action = 'nosuchaction';
}
# Workaround for bug #20966: inability of IE to provide an action dependent
# on which submit button is clicked.
// Workaround for bug #20966: inability of IE to provide an action dependent
// on which submit button is clicked.
if ( $action === 'historysubmit' ) {
if ( $request->getBool( 'revisiondelete' ) ) {
$action = 'revisiondelete';
@ -575,12 +575,12 @@ class MediaWiki {
$history->history();
break;
case 'revisiondelete':
# For show/hide submission from history page
// For show/hide submission from history page
$special = SpecialPage::getPage( 'Revisiondelete' );
$special->execute( '' );
break;
case 'revisionmove':
# For revision move submission from history page
// For revision move submission from history page
$special = SpecialPage::getPage( 'RevisionMove' );
$special->execute( '' );
break;