From: Mark A. Hershberger Date: Fri, 18 Mar 2011 20:37:11 +0000 (+0000) Subject: w/s diff. mostly eol w/s and using only tabs of width 4 to indent. X-Git-Tag: 1.31.0-rc.0~31345 X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=6826aed67097ded0c9a2366920009505f10a528c;p=lhc%2Fweb%2Fwiklou.git w/s diff. mostly eol w/s and using only tabs of width 4 to indent. --- diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index cba580bb92..4270d83af7 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -167,7 +167,7 @@ class AllmessagesTablePager extends TablePager { protected $mSkin; /** - * @var Language + * @var Language */ public $lang; diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php index 1fe2a96f39..64c1db50c1 100644 --- a/includes/specials/SpecialAllpages.php +++ b/includes/specials/SpecialAllpages.php @@ -20,7 +20,7 @@ * @file * @ingroup SpecialPage */ - + /** * Implements Special:Allpages * @@ -71,7 +71,7 @@ class SpecialAllpages extends IncludableSpecialPage { $namespaces = $wgContLang->getNamespaces(); - $wgOut->setPagetitle( + $wgOut->setPagetitle( ( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) ) ? wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) : wfMsg( 'allarticles' ) @@ -97,7 +97,7 @@ class SpecialAllpages extends IncludableSpecialPage { function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '' ) { global $wgScript; $t = $this->getTitle(); - + $out = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) ); $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); $out .= Html::hidden( 'title', $t->getPrefixedText() ); @@ -374,7 +374,7 @@ class SpecialAllpages extends IncludableSpecialPage { 'page_title', array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ), __METHOD__, - array( 'ORDER BY' => 'page_title DESC', + array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) ) ); diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 17e59e0eb1..71dd1af67c 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -70,7 +70,7 @@ class SpecialBlock extends SpecialPage { # User logs, UserRights, etc. $wgUser->getSkin()->setRelevantUser( $this->target ); } - + # bug 15810: blocked admins should have limited access here $status = self::checkUnblockSelf( $this->target ); if ( $status !== true ) { @@ -388,7 +388,7 @@ class SpecialBlock extends SpecialPage { if( $request instanceof WebRequest ){ $target = $request->getText( 'wpTarget', null ); } - break; + break; case 1: $target = $par; break; @@ -396,13 +396,13 @@ class SpecialBlock extends SpecialPage { if( $request instanceof WebRequest ){ $target = $request->getText( 'ip', null ); } - break; + break; case 3: # B/C @since 1.18 if( $request instanceof WebRequest ){ $target = $request->getText( 'wpBlockAddress', null ); } - break; + break; case 4: break 2; } diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php index 15682691af..b3aecd3f23 100644 --- a/includes/specials/SpecialBlockList.php +++ b/includes/specials/SpecialBlockList.php @@ -85,7 +85,7 @@ class SpecialBlockList extends SpecialPage { $form->setWrapperLegend( wfMsg( 'ipblocklist-legend' ) ); $form->setSubmitText( wfMsg( 'ipblocklist-submit' ) ); $form->prepareForm(); - + $form->displayForm( '' ); $this->showList(); } @@ -142,7 +142,7 @@ class SpecialBlockList extends SpecialPage { $chunk = self::getIpFragment( $start ); $dbr = wfGetDB( DB_SLAVE ); $like = $dbr->buildLike( $chunk, $dbr->anyString() ); - + # Fairly hard to make a malicious SQL statement out of hex characters, # but stranger things have happened... $safeStart = $dbr->addQuotes( IP::toHex( $start ) ); diff --git a/includes/specials/SpecialBooksources.php b/includes/specials/SpecialBooksources.php index 67fb54048e..13a651d279 100644 --- a/includes/specials/SpecialBooksources.php +++ b/includes/specials/SpecialBooksources.php @@ -77,7 +77,7 @@ class SpecialBookSources extends SpecialPage { $sum += 3 * $isbn{$i}; } } - + $check = (10 - ($sum % 10)) % 10; if ($check == $isbn{12}) { return true; @@ -86,7 +86,7 @@ class SpecialBookSources extends SpecialPage { for($i = 0; $i < 9; $i++) { $sum += $isbn{$i} * ($i + 1); } - + $check = $sum % 11; if($check == 10) { $check = "X"; diff --git a/includes/specials/SpecialBrokenRedirects.php b/includes/specials/SpecialBrokenRedirects.php index ddd6d48cd6..879a758e5d 100644 --- a/includes/specials/SpecialBrokenRedirects.php +++ b/includes/specials/SpecialBrokenRedirects.php @@ -32,7 +32,7 @@ class BrokenRedirectsPage extends PageQueryPage { function __construct( $name = 'BrokenRedirects' ) { parent::__construct( $name ); } - + function isExpensive() { return true; } function isSyndicated() { return false; } function sortDescending() { return false; } diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php index c2dd40cd46..bb5a5e8cc4 100644 --- a/includes/specials/SpecialCategories.php +++ b/includes/specials/SpecialCategories.php @@ -69,12 +69,12 @@ class CategoryPager extends AlphabeticPager { $this->mOffset = $from; } } - + function getQueryInfo() { return array( 'tables' => array( 'category' ), 'fields' => array( 'cat_title','cat_pages' ), - 'conds' => array( 'cat_pages > 0' ), + 'conds' => array( 'cat_pages > 0' ), 'options' => array( 'USE INDEX' => 'cat_title' ), ); } @@ -121,11 +121,11 @@ class CategoryPager extends AlphabeticPager { $wgLang->formatNum( $result->cat_pages ) ); return Xml::tags('li', null, "$titleText ($count)" ) . "\n"; } - + public function getStartForm( $from ) { global $wgScript; $t = SpecialPage::getTitleFor( 'Categories' ); - + return Xml::tags( 'form', array( 'method' => 'get', 'action' => $wgScript ), Html::hidden( 'title', $t->getPrefixedText() ) . diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php index bc21d927de..3e45d30d25 100644 --- a/includes/specials/SpecialConfirmemail.php +++ b/includes/specials/SpecialConfirmemail.php @@ -46,12 +46,12 @@ class EmailConfirmation extends UnlistedSpecialPage { function execute( $code ) { global $wgUser, $wgOut; $this->setHeaders(); - + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return; } - + if( empty( $code ) ) { if( $wgUser->isLoggedIn() ) { if( User::isValidEmailAddr( $wgUser->getEmail() ) ) { @@ -150,11 +150,11 @@ class EmailInvalidation extends UnlistedSpecialPage { $this->setHeaders(); if ( wfReadOnly() ) { - global $wgOut; + global $wgOut; $wgOut->readOnlyPage(); return; } - + $this->attemptInvalidate( $code ); } diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 3119fe7db6..4823af6e35 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -284,7 +284,7 @@ class SpecialContributions extends SpecialPage { array(), array( 'user' => $username ) ); - + # Other logs link $tools[] = $sk->linkKnown( SpecialPage::getTitleFor( 'Log' ), @@ -390,7 +390,7 @@ class SpecialContributions extends SpecialPage { Html::rawElement( 'p', array( 'style' => 'white-space: nowrap' ), Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) . ' ' . Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) - ) . ' '; + ) . ' '; $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' ); if( !wfEmptyMsg( 'sp-contributions-explain' ) ) { $f .= "

{$explain}

"; diff --git a/includes/specials/SpecialDeadendpages.php b/includes/specials/SpecialDeadendpages.php index bb9625afa6..f8ef4d44f7 100644 --- a/includes/specials/SpecialDeadendpages.php +++ b/includes/specials/SpecialDeadendpages.php @@ -46,7 +46,7 @@ class DeadendPagesPage extends PageQueryPage { } function isSyndicated() { - return false; + return false; } /** @@ -72,7 +72,7 @@ class DeadendPagesPage extends PageQueryPage { ) ) ) ); } - + function getOrderFields() { // For some crazy reason ordering by a constant // causes a filesort diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index e9e6f6639b..cb1ee946b7 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -211,7 +211,7 @@ class DeletedContribsPager extends IndexPager { } else { $mflag = ''; } - + // Revision delete link $canHide = $wgUser->isAllowed( 'deleterevision' ); if( $canHide || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { @@ -234,9 +234,9 @@ class DeletedContribsPager extends IndexPager { array( 'class' => 'mw-deletedcontribs-tools' ), wfMsg( 'parentheses', $wgLang->pipeList( array( $last, $dellog, $reviewlink ) ) ) ); - + $ret = "{$del}{$link} {$tools} . . {$mflag} {$pagelink} {$comment}"; - + # Denote if username is redacted for this edit if( $rev->isDeleted( Revision::DELETED_USER ) ) { $ret .= " " . wfMsgHtml('rev-deleted-user-contribs') . ""; @@ -381,7 +381,7 @@ class DeletedContributionsPage extends SpecialPage { array(), array( 'action' => 'unblock', - 'ip' => $nt->getDBkey() + 'ip' => $nt->getDBkey() ) ); } diff --git a/includes/specials/SpecialDisambiguations.php b/includes/specials/SpecialDisambiguations.php index 314a7fbb7f..4ca5eaca54 100644 --- a/includes/specials/SpecialDisambiguations.php +++ b/includes/specials/SpecialDisambiguations.php @@ -77,7 +77,7 @@ class DisambiguationsPage extends PageQueryPage { $set = 'FALSE'; wfDebug("Mediawiki:disambiguationspage message does not link to any templates!\n"); } - + // FIXME: What are pagelinks and p2 doing here? return array ( 'tables' => array( 'templatelinks', 'p1' => 'page', 'pagelinks', 'p2' => 'page' ), @@ -96,11 +96,11 @@ class DisambiguationsPage extends PageQueryPage { function getOrderFields() { return array( 'tl_namespace', 'tl_title', 'value' ); } - + function sortDescending() { return false; } - + /** * Fetch links and cache their existence */ diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php index d25de5ddc7..4242a0a334 100644 --- a/includes/specials/SpecialDoubleRedirects.php +++ b/includes/specials/SpecialDoubleRedirects.php @@ -32,7 +32,7 @@ class DoubleRedirectsPage extends PageQueryPage { function __construct( $name = 'DoubleRedirects' ) { parent::__construct( $name ); } - + function isExpensive() { return true; } function isSyndicated() { return false; } function sortDescending() { return false; } diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php index 2d058a915e..098d936c46 100644 --- a/includes/specials/SpecialEmailuser.php +++ b/includes/specials/SpecialEmailuser.php @@ -28,20 +28,20 @@ */ class SpecialEmailUser extends UnlistedSpecialPage { protected $mTarget; - + public function __construct(){ parent::__construct( 'Emailuser' ); } - + protected function getFormFields(){ global $wgUser; return array( 'From' => array( 'type' => 'info', 'raw' => 1, - 'default' => $wgUser->getSkin()->link( - $wgUser->getUserPage(), - htmlspecialchars( $wgUser->getName() ) + 'default' => $wgUser->getSkin()->link( + $wgUser->getUserPage(), + htmlspecialchars( $wgUser->getName() ) ), 'label-message' => 'emailfrom', 'id' => 'mw-emailuser-sender', @@ -49,8 +49,8 @@ class SpecialEmailUser extends UnlistedSpecialPage { 'To' => array( 'type' => 'info', 'raw' => 1, - 'default' => $wgUser->getSkin()->link( - $this->mTargetObj->getUserPage(), + 'default' => $wgUser->getSkin()->link( + $this->mTargetObj->getUserPage(), htmlspecialchars( $this->mTargetObj->getName() ) ), 'label-message' => 'emailto', @@ -82,7 +82,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { ), ); } - + public function execute( $par ) { global $wgRequest, $wgOut, $wgUser; @@ -93,7 +93,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { $this->mTarget = is_null( $par ) ? $wgRequest->getVal( 'wpTarget', $wgRequest->getVal( 'target', '' ) ) : $par; - + $ret = self::getTarget( $this->mTarget ); if( $ret instanceof User ){ $this->mTargetObj = $ret; @@ -101,7 +101,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { $wgOut->showErrorPage( "{$ret}title", "{$ret}text" ); return false; } - + $error = self::getPermissionsError( $wgUser, $wgRequest->getVal( 'wpEditToken' ) ); switch ( $error ) { case null: @@ -126,7 +126,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { $wgOut->showErrorPage( $title, $msg, $params ); return; } - + $form = new HTMLForm( $this->getFormFields() ); $form->addPreText( wfMsgExt( 'emailpagetext', 'parseinline' ) ); $form->setSubmitText( wfMsg( 'emailsend' ) ); @@ -134,14 +134,14 @@ class SpecialEmailUser extends UnlistedSpecialPage { $form->setSubmitCallback( array( __CLASS__, 'submit' ) ); $form->setWrapperLegend( wfMsgExt( 'email-legend', 'parsemag' ) ); $form->loadData(); - + if( !wfRunHooks( 'EmailUserForm', array( &$form ) ) ){ return false; } - + $wgOut->setPagetitle( wfMsg( 'emailpage' ) ); $result = $form->show(); - + if( $result === true || ( $result instanceof Status && $result->isGood() ) ){ $wgOut->setPagetitle( wfMsg( 'emailsent' ) ); $wgOut->addWikiMsg( 'emailsenttext' ); @@ -160,7 +160,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { wfDebug( "Target is empty.\n" ); return 'notarget'; } - + $nu = User::newFromName( $target ); if( !$nu instanceof User || !$nu->getId() ) { wfDebug( "Target is invalid user.\n" ); @@ -188,11 +188,11 @@ class SpecialEmailUser extends UnlistedSpecialPage { if( !$wgEnableEmail || !$wgEnableUserEmail ){ return 'usermaildisabled'; } - + if( !$user->isAllowed( 'sendemail' ) ) { return 'badaccess'; } - + if( !$user->isEmailConfirmed() ){ return 'mailnologin'; } @@ -219,7 +219,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { /** * Really send a mail. Permissions should have been checked using - * getPermissionsError(). It is probably also a good + * getPermissionsError(). It is probably also a good * idea to check the edit token and ping limiter in advance. * * @return Mixed: Status object, or potentially a String on error @@ -239,17 +239,17 @@ class SpecialEmailUser extends UnlistedSpecialPage { // Add a standard footer and trim up trailing newlines $text = rtrim( $text ) . "\n\n-- \n"; - $text .= wfMsgExt( + $text .= wfMsgExt( 'emailuserfooter', - array( 'content', 'parsemag' ), - array( $from->name, $to->name ) + array( 'content', 'parsemag' ), + array( $from->name, $to->name ) ); $error = ''; if( !wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$text, &$error ) ) ) { return $error; } - + if( $wgUserEmailUseReplyTo ) { // Put the generic wiki autogenerated address in the From: // header and reserve the user for Reply-To. @@ -284,12 +284,12 @@ class SpecialEmailUser extends UnlistedSpecialPage { return $status; } else { // if the user requested a copy of this mail, do this now, - // unless they are emailing themselves, in which case one + // unless they are emailing themselves, in which case one // copy of the message is sufficient. if ( $data['CCMe'] && $to != $from ) { $cc_subject = wfMsg( - 'emailccsubject', - $target->getName(), + 'emailccsubject', + $target->getName(), $subject ); wfRunHooks( 'EmailUserCC', array( &$from, &$from, &$cc_subject, &$text ) ); diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index c64e671986..4822cd4ae2 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -92,13 +92,13 @@ class SpecialExport extends SpecialPage { $page = $wgRequest->getText( 'pages' ); $this->curonly = $wgRequest->getCheck( 'curonly' ); $rawOffset = $wgRequest->getVal( 'offset' ); - + if( $rawOffset ) { $offset = wfTimestamp( TS_MW, $rawOffset ); } else { $offset = null; } - + $limit = $wgRequest->getInt( 'limit' ); $dir = $wgRequest->getVal( 'dir' ); $history = array( @@ -107,7 +107,7 @@ class SpecialExport extends SpecialPage { 'limit' => $wgExportMaxHistory, ); $historyCheck = $wgRequest->getCheck( 'history' ); - + if ( $this->curonly ) { $history = WikiExporter::CURRENT; } elseif ( !$historyCheck ) { @@ -129,7 +129,7 @@ class SpecialExport extends SpecialPage { // Default to current-only for GET requests. $page = $wgRequest->getText( 'pages', $par ); $historyCheck = $wgRequest->getCheck( 'history' ); - + if( $historyCheck ) { $history = WikiExporter::FULL; } else { @@ -153,20 +153,20 @@ class SpecialExport extends SpecialPage { if ( $this->doExport ) { $wgOut->disable(); - + // Cancel output buffering and gzipping if set // This should provide safer streaming for pages with history wfResetOutputBuffers(); $wgRequest->response()->header( "Content-type: application/xml; charset=utf-8" ); - + if( $wgRequest->getCheck( 'wpDownload' ) ) { // Provide a sane filename suggestion $filename = urlencode( $wgSitename . '-' . wfTimestampNow() . '.xml' ); $wgRequest->response()->header( "Content-disposition: attachment;filename={$filename}" ); } - + $this->doExport( $page, $history, $list_authors ); - + return; } @@ -195,14 +195,14 @@ class SpecialExport extends SpecialPage { } else { $wgOut->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) ); } - + $form .= Xml::checkLabel( - wfMsg( 'export-templates' ), - 'templates', - 'wpExportTemplates', + wfMsg( 'export-templates' ), + 'templates', + 'wpExportTemplates', $wgRequest->wasPosted() ? $wgRequest->getCheck( 'templates' ) : false ) . '
'; - + if( $wgExportMaxLinkDepth || $this->userCanOverrideExportDepth() ) { $form .= Xml::inputLabel( wfMsg( 'export-pagelinks' ), 'pagelink-depth', 'pagelink-depth', 20, 0 ) . '
'; } @@ -217,7 +217,7 @@ class SpecialExport extends SpecialPage { $form .= Xml::submitButton( wfMsg( 'export-submit' ), $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'export' ) ); $form .= Xml::closeElement( 'form' ); - + $wgOut->addHTML( $form ); } @@ -272,7 +272,7 @@ class SpecialExport extends SpecialPage { foreach( $pages as $k => $v ) { $pages[$k] = str_replace( " ", "_", $v ); } - + $pages = array_unique( $pages ); /* Ok, let's get to it... */ @@ -291,11 +291,11 @@ class SpecialExport extends SpecialPage { set_time_limit(0); wfRestoreWarnings(); } - + $exporter = new WikiExporter( $db, $history, $buffer ); $exporter->list_authors = $list_authors; $exporter->openStream(); - + foreach( $pages as $page ) { /* if( $wgExportMaxHistory && !$this->curonly ) { @@ -322,7 +322,7 @@ class SpecialExport extends SpecialPage { } $exporter->closeStream(); - + if( $lb ) { $lb->closeAll(); } @@ -343,7 +343,7 @@ class SpecialExport extends SpecialPage { ); $pages = array(); - + foreach ( $res as $row ) { $n = $row->page_title; if ($row->page_namespace) { @@ -369,10 +369,10 @@ class SpecialExport extends SpecialPage { ); $pages = array(); - + foreach ( $res as $row ) { $n = $row->page_title; - + if ( $row->page_namespace ) { $ns = $wgContLang->getNsText( $row->page_namespace ); $n = $ns . ':' . $n; @@ -402,17 +402,17 @@ class SpecialExport extends SpecialPage { */ private function validateLinkDepth( $depth ) { global $wgExportMaxLinkDepth; - + if( $depth < 0 ) { return 0; } - + if ( !$this->userCanOverrideExportDepth() ) { if( $depth > $wgExportMaxLinkDepth ) { return $wgExportMaxLinkDepth; } } - + /* * There's a HARD CODED limit of 5 levels of recursion here to prevent a * crazy-big export from being done by someone setting the depth @@ -426,21 +426,21 @@ class SpecialExport extends SpecialPage { for( ; $depth > 0; --$depth ) { $pageSet = $this->getLinks( $inputPages, $pageSet, 'pagelinks', - array( 'pl_namespace AS namespace', 'pl_title AS title' ), + array( 'pl_namespace AS namespace', 'pl_title AS title' ), array( 'page_id=pl_from' ) ); $inputPages = array_keys( $pageSet ); } - + return $pageSet; } /** * Expand a list of pages to include images used in those pages. - * + * * @param $inputPages array, list of titles to look up * @param $pageSet array, associative array indexed by titles for output - * + * * @return array associative array index by titles */ private function getImages( $inputPages, $pageSet ) { @@ -458,10 +458,10 @@ class SpecialExport extends SpecialPage { */ private function getLinks( $inputPages, $pageSet, $table, $fields, $join ) { $dbr = wfGetDB( DB_SLAVE ); - + foreach( $inputPages as $page ) { $title = Title::newFromText( $page ); - + if( $title ) { $pageSet[$title->getPrefixedText()] = true; /// @todo Fixme: May or may not be more efficient to batch these @@ -478,15 +478,15 @@ class SpecialExport extends SpecialPage { ), __METHOD__ ); - + foreach( $result as $row ) { $template = Title::makeTitle( $row->namespace, $row->title ); $pageSet[$template->getPrefixedText()] = true; } } } - + return $pageSet; } - + } diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php index 2e4b608f27..af93070cb9 100644 --- a/includes/specials/SpecialFileDuplicateSearch.php +++ b/includes/specials/SpecialFileDuplicateSearch.php @@ -89,13 +89,13 @@ class FileDuplicateSearchPage extends QueryPage { 'conds' => array( 'img_sha1' => $this->hash ) ); } - + function execute( $par ) { global $wgRequest, $wgOut, $wgLang, $wgContLang, $wgScript; - + $this->setHeaders(); $this->outputHeader(); - + $this->filename = isset( $par ) ? $par : $wgRequest->getText( 'filename' ); $this->file = null; $this->hash = ''; diff --git a/includes/specials/SpecialFilepath.php b/includes/specials/SpecialFilepath.php index 3e27b4353c..744940f36c 100644 --- a/includes/specials/SpecialFilepath.php +++ b/includes/specials/SpecialFilepath.php @@ -46,14 +46,14 @@ class SpecialFilepath extends SpecialPage { $this->showForm( $title ); } else { $file = wfFindFile( $title ); - + if ( $file && $file->exists() ) { // Default behaviour: Use the direct link to the file. $url = $file->getURL(); $width = $wgRequest->getInt( 'width', -1 ); $height = $wgRequest->getInt( 'height', -1 ); - // If a width is requested... + // If a width is requested... if ( $width != -1 ) { $mto = $file->transform( array( 'width' => $width, 'height' => $height ) ); // ... and we can diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php index b1292d2d10..336576cc90 100644 --- a/includes/specials/SpecialImport.php +++ b/includes/specials/SpecialImport.php @@ -30,14 +30,14 @@ * @ingroup SpecialPage */ class SpecialImport extends SpecialPage { - + private $interwiki = false; private $namespace; private $frompage = ''; private $logcomment= false; private $history = true; private $includeTemplates = false; - + /** * Constructor */ @@ -46,28 +46,28 @@ class SpecialImport extends SpecialPage { global $wgImportTargetNamespace; $this->namespace = $wgImportTargetNamespace; } - + /** * Execute */ function execute( $par ) { global $wgRequest; - + $this->setHeaders(); $this->outputHeader(); - + if ( wfReadOnly() ) { global $wgOut; $wgOut->readOnlyPage(); return; } - + if ( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit' ) { $this->doImport(); } $this->showForm(); } - + /** * Do the actual import */ @@ -290,8 +290,8 @@ class ImportReporter { private $mLogItemCount = 0; function __construct( $importer, $upload, $interwiki , $reason=false ) { - $this->mOriginalPageOutCallback = - $importer->setPageOutCallback( array( $this, 'reportPage' ) ); + $this->mOriginalPageOutCallback = + $importer->setPageOutCallback( array( $this, 'reportPage' ) ); $this->mOriginalLogCallback = $importer->setLogItemCallback( array( $this, 'reportLogItem' ) ); $this->mPageCount = 0; @@ -304,7 +304,7 @@ class ImportReporter { global $wgOut; $wgOut->addHTML( "