From: Aryeh Gregor Date: Thu, 26 Aug 2010 19:40:29 +0000 (+0000) Subject: Style fixes for Linker.php X-Git-Tag: 1.31.0-rc.0~35313 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=17aabb2d00f393e11dde2c03d14a06769b00b4ca;p=lhc%2Fweb%2Fwiklou.git Style fixes for Linker.php Mostly stylize.php, some manual. As usual, if you're seeing this in a blame, use "svn blame -x -w" or "git blame -w", as appropriate. --- diff --git a/includes/Linker.php b/includes/Linker.php index 981b98caf3..00ae033ab5 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -59,7 +59,7 @@ class Linker { * @param $unused String: unused * @param $class String: the contents of the class attribute, default none */ - function getInternalLinkAttributes( $title, $unused = null, $class='' ) { + function getInternalLinkAttributes( $title, $unused = null, $class = '' ) { $title = urldecode( $title ); $title = str_replace( '_', ' ', $title ); return $this->getLinkAttributesInternal( $title, $class ); @@ -76,7 +76,7 @@ class Linker { * attribute; if false, default to the name of the page we're linking to */ function getInternalLinkAttributesObj( $nt, $unused = null, $class = '', $title = false ) { - if( $title === false ) { + if ( $title === false ) { $title = $nt->getPrefixedText(); } return $this->getLinkAttributesInternal( $title, $class ); @@ -92,7 +92,7 @@ class Linker { if ( $class != '' ) { $r .= " class=\"$class\""; } - if ( $title != '') { + if ( $title != '' ) { $r .= " title=\"$title\""; } return $r; @@ -158,13 +158,13 @@ class Linker { */ public function link( $target, $text = null, $customAttribs = array(), $query = array(), $options = array() ) { wfProfileIn( __METHOD__ ); - if( !$target instanceof Title ) { + if ( !$target instanceof Title ) { return "$text"; } $options = (array)$options; $ret = null; - if( !wfRunHooks( 'LinkBegin', array( $this, $target, &$text, + if ( !wfRunHooks( 'LinkBegin', array( $this, $target, &$text, &$customAttribs, &$query, &$options, &$ret ) ) ) { wfProfileOut( __METHOD__ ); return $ret; @@ -175,24 +175,24 @@ class Linker { # If we don't know whether the page exists, let's find out. wfProfileIn( __METHOD__ . '-checkPageExistence' ); - if( !in_array( 'known', $options ) and !in_array( 'broken', $options ) ) { - if( $target->isKnown() ) { - $options []= 'known'; + if ( !in_array( 'known', $options ) and !in_array( 'broken', $options ) ) { + if ( $target->isKnown() ) { + $options[] = 'known'; } else { - $options []= 'broken'; + $options[] = 'broken'; } } wfProfileOut( __METHOD__ . '-checkPageExistence' ); $oldquery = array(); - if( in_array( "forcearticlepath", $options ) && $query ){ + if ( in_array( "forcearticlepath", $options ) && $query ) { $oldquery = $query; $query = array(); } # Note: we want the href attribute first, for prettiness. $attribs = array( 'href' => $this->linkUrl( $target, $query, $options ) ); - if( in_array( 'forcearticlepath', $options ) && $oldquery ){ + if ( in_array( 'forcearticlepath', $options ) && $oldquery ) { $attribs['href'] = wfAppendQuery( $attribs['href'], wfArrayToCgi( $oldquery ) ); } @@ -200,12 +200,12 @@ class Linker { $attribs, $this->linkAttribs( $target, $customAttribs, $options ) ); - if( is_null( $text ) ) { + if ( is_null( $text ) ) { $text = $this->linkText( $target ); } $ret = null; - if( wfRunHooks( 'LinkEnd', array( $this, $target, $options, &$text, &$attribs, &$ret ) ) ) { + if ( wfRunHooks( 'LinkEnd', array( $this, $target, $options, &$text, &$attribs, &$ret ) ) ) { $ret = Html::rawElement( 'a', $attribs, $text ); } @@ -216,7 +216,7 @@ class Linker { /** * Identical to link(), except $options defaults to 'known'. */ - public function linkKnown( $target, $text = null, $customAttribs = array(), $query = array(), $options = array('known','noclasses') ) { + public function linkKnown( $target, $text = null, $customAttribs = array(), $query = array(), $options = array( 'known', 'noclasses' ) ) { return $this->link( $target, $text, $customAttribs, $query, $options ); } @@ -227,7 +227,7 @@ class Linker { wfProfileIn( __METHOD__ ); # We don't want to include fragments for broken links, because they # generally make no sense. - if( in_array( 'broken', $options ) and $target->mFragment !== '' ) { + if ( in_array( 'broken', $options ) and $target->mFragment !== '' ) { $target = clone $target; $target->mFragment = ''; } @@ -235,7 +235,7 @@ class Linker { # If it's a broken link, add the appropriate query pieces, unless # there's already an action specified, or unless 'edit' makes no sense # (i.e., for a nonexistent special page). - if( in_array( 'broken', $options ) and empty( $query['action'] ) + if ( in_array( 'broken', $options ) and empty( $query['action'] ) and $target->getNamespace() != NS_SPECIAL ) { $query['action'] = 'edit'; $query['redlink'] = '1'; @@ -253,16 +253,16 @@ class Linker { global $wgUser; $defaults = array(); - if( !in_array( 'noclasses', $options ) ) { + if ( !in_array( 'noclasses', $options ) ) { wfProfileIn( __METHOD__ . '-getClasses' ); # Now build the classes. $classes = array(); - if( in_array( 'broken', $options ) ) { + if ( in_array( 'broken', $options ) ) { $classes[] = 'new'; } - if( $target->isExternal() ) { + if ( $target->isExternal() ) { $classes[] = 'extiw'; } @@ -272,17 +272,17 @@ class Linker { $classes[] = $colour; # mw-redirect or stub } } - if( $classes != array() ) { + if ( $classes != array() ) { $defaults['class'] = implode( ' ', $classes ); } wfProfileOut( __METHOD__ . '-getClasses' ); } # Get a default title attribute. - if( $target->getPrefixedText() == '' ) { + if ( $target->getPrefixedText() == '' ) { # A link like [[#Foo]]. This used to mean an empty title # attribute, but that's silly. Just don't output a title. - } elseif( in_array( 'known', $options ) ) { + } elseif ( in_array( 'known', $options ) ) { $defaults['title'] = $target->getPrefixedText(); } else { $defaults['title'] = wfMsg( 'red-link-title', $target->getPrefixedText() ); @@ -292,10 +292,10 @@ class Linker { # over that, deleting all "false" attributes. $ret = array(); $merged = Sanitizer::mergeAttributes( $defaults, $attribs ); - foreach( $merged as $key => $val ) { + foreach ( $merged as $key => $val ) { # A false value suppresses the attribute, and we don't want the # href attribute to be overridden. - if( $key != 'href' and $val !== false ) { + if ( $key != 'href' and $val !== false ) { $ret[$key] = $val; } } @@ -308,13 +308,13 @@ class Linker { */ private function linkText( $target ) { # We might be passed a non-Title by make*LinkObj(). Fail gracefully. - if( !$target instanceof Title ) { + if ( !$target instanceof Title ) { return ''; } # If the target is just a fragment, with no title, we return the frag- # ment text. Otherwise, we return the title text itself. - if( $target->getPrefixedText() === '' and $target->getFragment() !== '' ) { + if ( $target->getPrefixedText() === '' and $target->getFragment() !== '' ) { return htmlspecialchars( $target->getFragment() ); } return htmlspecialchars( $target->getPrefixedText() ); @@ -336,7 +336,7 @@ class Linker { function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) { global $wgUser; wfDeprecated( __METHOD__ ); - + $threshold = $wgUser->getStubThreshold(); $colour = ( $size < $threshold ) ? 'stub' : ''; // FIXME: replace deprecated makeColouredLinkObj by link() @@ -393,9 +393,9 @@ class Linker { $alt = $this->fnamePart( $url ); } $img = ''; - $success = wfRunHooks('LinkerMakeExternalImage', array( &$url, &$alt, &$img ) ); - if(!$success) { - wfDebug("Hook LinkerMakeExternalImage changed the output of external image with url {$url} and alt text {$alt} to {$img}\n", true); + $success = wfRunHooks( 'LinkerMakeExternalImage', array( &$url, &$alt, &$img ) ); + if ( !$success ) { + wfDebug( "Hook LinkerMakeExternalImage changed the output of external image with url {$url} and alt text {$alt} to {$img}\n", true ); return $img; } return Html::element( 'img', @@ -437,14 +437,14 @@ class Linker { */ function makeImageLink2( Title $title, $file, $frameParams = array(), $handlerParams = array(), $time = false, $query = "", $widthOption = null ) { $res = null; - if( !wfRunHooks( 'ImageBeforeProduceHTML', array( &$this, &$title, + if ( !wfRunHooks( 'ImageBeforeProduceHTML', array( &$this, &$title, &$file, &$frameParams, &$handlerParams, &$time, &$res ) ) ) { return $res; } global $wgContLang, $wgThumbLimits, $wgThumbUpright; if ( $file && !$file->allowInlineDisplay() ) { - wfDebug( __METHOD__.': '.$title->getPrefixedDBkey()." does not allow inline display\n" ); + wfDebug( __METHOD__ . ': ' . $title->getPrefixedDBkey() . " does not allow inline display\n" ); return $this->link( $title ); } @@ -468,8 +468,8 @@ class Linker { if ( $file && !isset( $hp['width'] ) ) { $hp['width'] = $file->getWidth( $page ); - if( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) || !$hp['width'] ) { - if( !isset( $widthOption ) || !isset( $wgThumbLimits[$widthOption] ) ) { + if ( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) || !$hp['width'] ) { + if ( !isset( $widthOption ) || !isset( $wgThumbLimits[$widthOption] ) ) { $widthOption = User::getDefaultOption( 'thumbsize' ); } @@ -483,7 +483,7 @@ class Linker { round( $wgThumbLimits[$widthOption] * $fp['upright'], -1 ) : $wgThumbLimits[$widthOption]; if ( $hp['width'] <= 0 || $prefWidth < $hp['width'] ) { - if( !isset( $hp['height'] ) ) { + if ( !isset( $hp['height'] ) ) { $hp['width'] = $prefWidth; } } @@ -501,7 +501,7 @@ class Linker { if ( $fp['align'] == '' ) { $fp['align'] = $wgContLang->alignEnd(); } - return $prefix.$this->makeThumbLink2( $title, $file, $fp, $hp, $time, $query ).$postfix; + return $prefix . $this->makeThumbLink2( $title, $file, $fp, $hp, $time, $query ) . $postfix; } if ( $file && isset( $fp['frameless'] ) ) { @@ -521,7 +521,7 @@ class Linker { } if ( !$thumb ) { - $s = $this->makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time==true ); + $s = $this->makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time == true ); } else { $params = array( 'alt' => $fp['alt'], @@ -535,11 +535,11 @@ class Linker { if ( $fp['align'] != '' ) { $s = "
{$s}
"; } - return str_replace("\n", ' ',$prefix.$s.$postfix); + return str_replace( "\n", ' ', $prefix . $s . $postfix ); } /** - * Get the link parameters for MediaTransformOutput::toHtml() from given + * Get the link parameters for MediaTransformOutput::toHtml() from given * frame parameters supplied by the Parser. * @param $frameParams The frame parameters * @param $query An optional query string to add to description page links @@ -570,7 +570,7 @@ class Linker { * @param $framed Boolean * @param $manualthumb String */ - function makeThumbLinkObj( Title $title, $file, $label = '', $alt, $align = 'right', $params = array(), $framed=false , $manualthumb = "" ) { + function makeThumbLinkObj( Title $title, $file, $label = '', $alt, $align = 'right', $params = array(), $framed = false , $manualthumb = "" ) { $frameParams = array( 'alt' => $alt, 'caption' => $label, @@ -607,7 +607,7 @@ class Linker { if ( isset( $fp['manualthumb'] ) ) { # Use manually specified thumbnail $manual_title = Title::makeTitleSafe( NS_FILE, $fp['manualthumb'] ); - if( $manual_title ) { + if ( $manual_title ) { $manual_img = wfFindFile( $manual_title ); if ( $manual_img ) { $thumb = $manual_img->getUnscaledThumb( $hp ); @@ -639,13 +639,13 @@ class Linker { # So we don't need to pass it here in $query. However, the URL for the # zoom icon still needs it, so we make a unique query for it. See bug 14771 $url = $title->getLocalURL( $query ); - if( $page ) { + if ( $page ) { $url = wfAppendQuery( $url, 'page=' . urlencode( $page ) ); } $s = "
"; - if( !$exists ) { - $s .= $this->makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time==true ); + if ( !$exists ) { + $s .= $this->makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time == true ); $zoomIcon = ''; } elseif ( !$thumb ) { $s .= htmlspecialchars( wfMsg( 'thumbnail_error', '' ) ); @@ -660,15 +660,15 @@ class Linker { if ( isset( $fp['framed'] ) ) { $zoomIcon = ""; } else { - $zoomIcon = '
'. + $zoomIcon = '
' . ''. + 'title="' . htmlspecialchars( wfMsg( 'thumbnail-more' ) ) . '">' . '
'; } } $s .= '
' . $zoomIcon . $fp['caption'] . "
"; - return str_replace("\n", ' ', $s); + return str_replace( "\n", ' ', $s ); } /** @@ -684,26 +684,26 @@ class Linker { */ public function makeBrokenImageLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '', $time = false ) { global $wgEnableUploads, $wgUploadMissingFileUrl; - if( $title instanceof Title ) { + if ( $title instanceof Title ) { wfProfileIn( __METHOD__ ); $currentExists = $time ? ( wfFindFile( $title ) != false ) : false; - if( ( $wgUploadMissingFileUrl || $wgEnableUploads ) && !$currentExists ) { - if( $text == '' ) + if ( ( $wgUploadMissingFileUrl || $wgEnableUploads ) && !$currentExists ) { + if ( $text == '' ) $text = htmlspecialchars( $title->getPrefixedText() ); $redir = RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title ); - if( $redir ) { + if ( $redir ) { wfProfileOut( __METHOD__ ); return $this->makeKnownLinkObj( $title, $text, $query, $trail, $prefix ); } - + $href = $this->getUploadUrl( $title, $query ); list( $inside, $trail ) = self::splitTrail( $trail ); wfProfileOut( __METHOD__ ); - return '' . htmlspecialchars( $prefix . $text . $inside, ENT_NOQUOTES ) . '' . $trail; } else { @@ -714,10 +714,10 @@ class Linker { return "{$prefix}{$text}{$trail}"; } } - + /** * Get the URL to upload a certain file - * + * * @param $destFile Title object of the file to upload * @param $query String: urlencoded query string to prepend * @return String: urlencoded URL @@ -725,15 +725,15 @@ class Linker { protected function getUploadUrl( $destFile, $query = '' ) { global $wgUploadMissingFileUrl; $q = 'wpDestFile=' . $destFile->getPartialUrl(); - if( $query != '' ) + if ( $query != '' ) $q .= '&' . $query; - if( $wgUploadMissingFileUrl ) { + if ( $wgUploadMissingFileUrl ) { return wfAppendQuery( $wgUploadMissingFileUrl, $q ); } else { $upload = SpecialPage::getTitleFor( 'Upload' ); return $upload->getLocalUrl( $q ); - } + } } /** @@ -747,12 +747,12 @@ class Linker { * @todo Handle invalid or missing images better. */ public function makeMediaLinkObj( $title, $text = '', $time = false ) { - if( is_null( $title ) ) { - ### HOTFIX. Instead of breaking, return empty string. + if ( is_null( $title ) ) { + # # # HOTFIX. Instead of breaking, return empty string. return $text; } else { $img = wfFindFile( $title, array( 'time' => $time ) ); - if( $img ) { + if ( $img ) { $url = $img->getURL(); $class = 'internal'; } else { @@ -760,7 +760,7 @@ class Linker { $class = 'new'; } $alt = htmlspecialchars( $title->getText(), ENT_QUOTES ); - if( $text == '' ) { + if ( $text == '' ) { $text = $alt; } $u = htmlspecialchars( $url ); @@ -799,24 +799,28 @@ class Linker { * hook play with them, *then* expand it all at once. */ function makeExternalLink( $url, $text, $escape = true, $linktype = '', $attribs = array() ) { - if ( isset( $attribs[ 'class' ] ) ) $class = $attribs[ 'class' ]; # yet another hack :( - else $class = 'external ' . $linktype; + if ( isset( $attribs['class'] ) ) { + # yet another hack :( + $class = $attribs['class']; + } else { + $class = "external $linktype"; + } $attribsText = $this->getExternalLinkAttributes( $class ); $url = htmlspecialchars( $url ); - if( $escape ) { + if ( $escape ) { $text = htmlspecialchars( $text ); } $link = ''; - $success = wfRunHooks('LinkerMakeExternalLink', array( &$url, &$text, &$link, &$attribs, $linktype ) ); - if(!$success) { - wfDebug("Hook LinkerMakeExternalLink changed the output of link with url {$url} and text {$text} to {$link}\n", true); + $success = wfRunHooks( 'LinkerMakeExternalLink', array( &$url, &$text, &$link, &$attribs, $linktype ) ); + if ( !$success ) { + wfDebug( "Hook LinkerMakeExternalLink changed the output of link with url {$url} and text {$text} to {$link}\n", true ); return $link; } if ( $attribs ) { $attribsText .= Html::expandAttributes( $attribs ); } - return ''.$text.''; + return '' . $text . ''; } /** @@ -827,7 +831,7 @@ class Linker { * @private */ function userLink( $userId, $userText ) { - if( $userId == 0 ) { + if ( $userId == 0 ) { $page = SpecialPage::getTitleFor( 'Contributions', $userText ); } else { $page = Title::makeTitle( NS_USER, $userText ); @@ -846,21 +850,21 @@ class Linker { * @param $edits Integer: user edit count (optional, for performance) * @return String: HTML fragment */ - public function userToolLinks( $userId, $userText, $redContribsWhenNoEdits = false, $flags = 0, $edits=null ) { + public function userToolLinks( $userId, $userText, $redContribsWhenNoEdits = false, $flags = 0, $edits = null ) { global $wgUser, $wgDisableAnonTalk, $wgSysopUserBans, $wgLang; $talkable = !( $wgDisableAnonTalk && 0 == $userId ); $blockable = ( $wgSysopUserBans || 0 == $userId ) && !$flags & self::TOOL_LINKS_NOBLOCK; $items = array(); - if( $talkable ) { + if ( $talkable ) { $items[] = $this->userTalkLink( $userId, $userText ); } - if( $userId ) { + if ( $userId ) { // check if the user has an edit $attribs = array(); - if( $redContribsWhenNoEdits ) { - $count = !is_null($edits) ? $edits : User::edits( $userId ); - if( $count == 0 ) { + if ( $redContribsWhenNoEdits ) { + $count = !is_null( $edits ) ? $edits : User::edits( $userId ); + if ( $count == 0 ) { $attribs['class'] = 'new'; } } @@ -868,11 +872,11 @@ class Linker { $items[] = $this->link( $contribsPage, wfMsgHtml( 'contribslink' ), $attribs ); } - if( $blockable && $wgUser->isAllowed( 'block' ) ) { + if ( $blockable && $wgUser->isAllowed( 'block' ) ) { $items[] = $this->blockLink( $userId, $userText ); } - if( $items ) { + if ( $items ) { return ' (' . $wgLang->pipeList( $items ) . ')'; } else { return ''; @@ -885,7 +889,7 @@ class Linker { * @param $userText String: user name or IP address * @param $edits Integer: user edit count (optional, for performance) */ - public function userToolLinksRedContribs( $userId, $userText, $edits=null ) { + public function userToolLinksRedContribs( $userId, $userText, $edits = null ) { return $this->userToolLinks( $userId, $userText, true, 0, $edits ); } @@ -921,15 +925,15 @@ class Linker { * @return String: HTML fragment */ function revUserLink( $rev, $isPublic = false ) { - if( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) { + if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) { $link = wfMsgHtml( 'rev-deleted-user' ); - } else if( $rev->userCan( Revision::DELETED_USER ) ) { + } else if ( $rev->userCan( Revision::DELETED_USER ) ) { $link = $this->userLink( $rev->getUser( Revision::FOR_THIS_USER ), $rev->getUserText( Revision::FOR_THIS_USER ) ); } else { $link = wfMsgHtml( 'rev-deleted-user' ); } - if( $rev->isDeleted( Revision::DELETED_USER ) ) { + if ( $rev->isDeleted( Revision::DELETED_USER ) ) { return '' . $link . ''; } return $link; @@ -942,9 +946,9 @@ class Linker { * @return string HTML */ function revUserTools( $rev, $isPublic = false ) { - if( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) { + if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) { $link = wfMsgHtml( 'rev-deleted-user' ); - } else if( $rev->userCan( Revision::DELETED_USER ) ) { + } else if ( $rev->userCan( Revision::DELETED_USER ) ) { $userId = $rev->getUser( Revision::FOR_THIS_USER ); $userText = $rev->getUserText( Revision::FOR_THIS_USER ); $link = $this->userLink( $userId, $userText ) . @@ -952,7 +956,7 @@ class Linker { } else { $link = wfMsgHtml( 'rev-deleted-user' ); } - if( $rev->isDeleted( Revision::DELETED_USER ) ) { + if ( $rev->isDeleted( Revision::DELETED_USER ) ) { return ' ' . $link . ''; } return $link; @@ -974,7 +978,7 @@ class Linker { * @param $title Mixed: Title object (to generate link to the section in autocomment) or null * @param $local Boolean: whether section links should refer to local page */ - function formatComment($comment, $title = null, $local = false) { + function formatComment( $comment, $title = null, $local = false ) { wfProfileIn( __METHOD__ ); # Sanitize text a bit: @@ -1048,11 +1052,11 @@ class Linker { } } $auto = "$link$auto"; - if( $pre ) { + if ( $pre ) { # written summary $presep autocomment (summary /* section */) $auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto; } - if( $post ) { + if ( $post ) { # autocomment $postsep written summary (/* section */ summary) $auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) ); } @@ -1092,33 +1096,33 @@ class Linker { $comment = $match[0]; # fix up urlencoded title texts (copied from Parser::replaceInternalLinks) - if( strpos( $match[1], '%' ) !== false ) { - $match[1] = str_replace( array('<', '>'), array('<', '>'), urldecode($match[1]) ); + if ( strpos( $match[1], '%' ) !== false ) { + $match[1] = str_replace( array( '<', '>' ), array( '<', '>' ), urldecode( $match[1] ) ); } # Handle link renaming [[foo|text]] will show link as "text" - if( $match[3] != "" ) { + if ( $match[3] != "" ) { $text = $match[3]; } else { $text = $match[1]; } $submatch = array(); $thelink = null; - if( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) { + if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) { # Media link; trail not supported. $linkRegexp = '/\[\[(.*?)\]\]/'; $title = Title::makeTitleSafe( NS_FILE, $submatch[1] ); $thelink = $this->makeMediaLinkObj( $title, $text ); } else { # Other kind of link - if( preg_match( $wgContLang->linkTrail(), $match[4], $submatch ) ) { + if ( preg_match( $wgContLang->linkTrail(), $match[4], $submatch ) ) { $trail = $submatch[1]; } else { $trail = ""; } $linkRegexp = '/\[\[(.*?)\]\]' . preg_quote( $trail, '/' ) . '/'; - if (isset($match[1][0]) && $match[1][0] == ':') - $match[1] = substr($match[1], 1); + if ( isset( $match[1][0] ) && $match[1][0] == ':' ) + $match[1] = substr( $match[1], 1 ); list( $inside, $trail ) = Linker::splitTrail( $trail ); $linkText = $text; @@ -1126,11 +1130,11 @@ class Linker { $match[1], $linkText ); $target = Title::newFromText( $linkTarget ); - if( $target ) { - if( $target->getText() == '' && $target->getInterwiki() === '' + if ( $target ) { + if ( $target->getText() == '' && $target->getInterwiki() === '' && !$this->commentLocal && $this->commentContextTitle ) { - $newTarget = clone( $this->commentContextTitle ); + $newTarget = clone ( $this->commentContextTitle ); $newTarget->setFragment( '#' . $target->getFragment() ); $target = $newTarget; } @@ -1140,7 +1144,7 @@ class Linker { ) . $trail; } } - if( $thelink ) { + if ( $thelink ) { // If the link is still valid, go ahead and replace it in! $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 ); } @@ -1162,9 +1166,9 @@ class Linker { # Some namespaces don't allow subpages, # so only perform processing if subpages are allowed - if( $contextTitle && MWNamespace::hasSubpages( $contextTitle->getNamespace() ) ) { + if ( $contextTitle && MWNamespace::hasSubpages( $contextTitle->getNamespace() ) ) { $hash = strpos( $target, '#' ); - if( $hash !== false ) { + if ( $hash !== false ) { $suffix = substr( $target, $hash ); $target = substr( $target, 0, $hash ); } else { @@ -1173,41 +1177,41 @@ class Linker { # bug 7425 $target = trim( $target ); # Look at the first character - if( $target != '' && $target{0} === '/' ) { + if ( $target != '' && $target { 0 } === '/' ) { # / at end means we don't want the slash to be shown $m = array(); $trailingSlashes = preg_match_all( '%(/+)$%', $target, $m ); - if( $trailingSlashes ) { - $noslash = $target = substr( $target, 1, -strlen($m[0][0]) ); + if ( $trailingSlashes ) { + $noslash = $target = substr( $target, 1, -strlen( $m[0][0] ) ); } else { $noslash = substr( $target, 1 ); } - $ret = $contextTitle->getPrefixedText(). '/' . trim($noslash) . $suffix; - if( $text === '' ) { + $ret = $contextTitle->getPrefixedText() . '/' . trim( $noslash ) . $suffix; + if ( $text === '' ) { $text = $target . $suffix; } # this might be changed for ugliness reasons } else { # check for .. subpage backlinks $dotdotcount = 0; $nodotdot = $target; - while( strncmp( $nodotdot, "../", 3 ) == 0 ) { + while ( strncmp( $nodotdot, "../", 3 ) == 0 ) { ++$dotdotcount; $nodotdot = substr( $nodotdot, 3 ); } - if($dotdotcount > 0) { + if ( $dotdotcount > 0 ) { $exploded = explode( '/', $contextTitle->GetPrefixedText() ); - if( count( $exploded ) > $dotdotcount ) { # not allowed to go below top level page + if ( count( $exploded ) > $dotdotcount ) { # not allowed to go below top level page $ret = implode( '/', array_slice( $exploded, 0, -$dotdotcount ) ); # / at the end means don't show full path - if( substr( $nodotdot, -1, 1 ) === '/' ) { + if ( substr( $nodotdot, -1, 1 ) === '/' ) { $nodotdot = substr( $nodotdot, 0, -1 ); - if( $text === '' ) { + if ( $text === '' ) { $text = $nodotdot . $suffix; } } $nodotdot = trim( $nodotdot ); - if( $nodotdot != '' ) { + if ( $nodotdot != '' ) { $ret .= '/' . $nodotdot; } $ret .= $suffix; @@ -1234,7 +1238,7 @@ class Linker { // '*' used to be the comment inserted by the software way back // in antiquity in case none was provided, here for backwards // compatability, acc. to brion -ævar - if( $comment == '' || $comment == '*' ) { + if ( $comment == '' || $comment == '*' ) { return ''; } else { $formatted = $this->formatComment( $comment, $title, $local ); @@ -1252,16 +1256,16 @@ class Linker { * @return String: HTML fragment */ function revComment( Revision $rev, $local = false, $isPublic = false ) { - if( $rev->getRawComment() == "" ) return ""; - if( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) { + if ( $rev->getRawComment() == "" ) return ""; + if ( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) { $block = " " . wfMsgHtml( 'rev-deleted-comment' ) . ""; - } else if( $rev->userCan( Revision::DELETED_COMMENT ) ) { + } else if ( $rev->userCan( Revision::DELETED_COMMENT ) ) { $block = $this->commentBlock( $rev->getComment( Revision::FOR_THIS_USER ), $rev->getTitle(), $local ); } else { $block = " " . wfMsgHtml( 'rev-deleted-comment' ) . ""; } - if( $rev->isDeleted( Revision::DELETED_COMMENT ) ) { + if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) { return " $block"; } return $block; @@ -1289,8 +1293,8 @@ class Linker { /** * Finish one or more sublevels on the Table of Contents */ - function tocUnindent($level) { - return "\n" . str_repeat( "\n\n", $level>0 ? $level : 0 ); + function tocUnindent( $level ) { + return "\n" . str_repeat( "\n\n", $level > 0 ? $level : 0 ); } /** @@ -1321,8 +1325,8 @@ class Linker { * @param $toc String: html of the Table Of Contents * @return String: full html of the TOC */ - function tocList($toc) { - $title = wfMsgHtml('toc') ; + function tocList( $toc ) { + $title = wfMsgHtml( 'toc' ) ; return '
' . '

' . $title . "

\n" @@ -1332,8 +1336,8 @@ class Linker { . "\n
" . Html::inlineScript( 'if (window.showTocToggle) {' - . ' var tocShowText = "' . Xml::escapeJsString( wfMsg('showtoc') ) . '";' - . ' var tocHideText = "' . Xml::escapeJsString( wfMsg('hidetoc') ) . '";' + . ' var tocShowText = "' . Xml::escapeJsString( wfMsg( 'showtoc' ) ) . '";' + . ' var tocHideText = "' . Xml::escapeJsString( wfMsg( 'hidetoc' ) ) . '";' . ' showTocToggle();' . ' } ' ) . "\n"; @@ -1384,10 +1388,10 @@ class Linker { // HTML generated here should probably have userlangattributes // added to it for LTR text on RTL pages $attribs = array(); - if( !is_null( $tooltip ) ) { + if ( !is_null( $tooltip ) ) { $attribs['title'] = wfMsgReal( 'editsectionhint', array( $tooltip ), true, $lang ); } - $link = $this->link( $nt, wfMsgExt( 'editsection', array( 'language'=> $lang ) ), + $link = $this->link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ), $attribs, array( 'action' => 'edit', 'section' => $section ), array( 'noclasses', 'known' ) @@ -1396,24 +1400,24 @@ class Linker { # Run the old hook. This takes up half of the function . . . hopefully # we can rid of it someday. $attribs = ''; - if( $tooltip ) { + if ( $tooltip ) { $attribs = htmlspecialchars( wfMsgReal( 'editsectionhint', array( $tooltip ), true, $lang ) ); $attribs = " title=\"$attribs\""; } $result = null; wfRunHooks( 'EditSectionLink', array( &$this, $nt, $section, $attribs, $link, &$result ) ); - if( !is_null( $result ) ) { + if ( !is_null( $result ) ) { # For reverse compatibility, add the brackets *after* the hook is # run, and even add them to hook-provided text. (This is the main # reason that the EditSectionLink hook is deprecated in favor of # DoEditSectionLink: it can't change the brackets or the span.) - $result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language'=>$lang ), $link ); + $result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $link ); return "$result"; } # Add the brackets and the span, and *then* run the nice new hook, with # clean and non-redundant arguments. - $result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language'=>$lang ), $link ); + $result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $link ); $result = "$result"; wfRunHooks( 'DoEditSectionLink', array( $this, $nt, $section, $tooltip, &$result ) ); @@ -1499,7 +1503,7 @@ class Linker { 'action' => 'rollback', 'from' => $rev->getUserText() ); - if( $wgRequest->getBool( 'bot' ) ) { + if ( $wgRequest->getBool( 'bot' ) ) { $query['bot'] = '1'; $query['hidediff'] = '1'; // bug 15999 } @@ -1526,7 +1530,7 @@ class Linker { if ( count( $templates ) > 0 ) { # Do a batch existence check $batch = new LinkBatch; - foreach( $templates as $title ) { + foreach ( $templates as $title ) { $batch->addObj( $title ); } $batch->execute(); @@ -1552,7 +1556,7 @@ class Linker { } else { $protected = ''; } - if( $titleObj->quickUserCan( 'edit' ) ) { + if ( $titleObj->quickUserCan( 'edit' ) ) { $editLink = $this->link( $titleObj, wfMsg( 'editlink' ), @@ -1643,7 +1647,7 @@ class Linker { if ( $options == 'withaccess' ) { $accesskey = $this->accesskey( $name ); - if( $accesskey !== false ) { + if ( $accesskey !== false ) { if ( $tooltip === false || $tooltip === '' ) { $tooltip = "[$accesskey]"; } else { @@ -1746,7 +1750,7 @@ class Linker { if ( $nt instanceof Title ) { $result = $this->makeLinkObj( $nt, $text, $query, $trail ); } else { - wfDebug( 'Invalid title passed to Linker::makeLink(): "'.$title."\"\n" ); + wfDebug( 'Invalid title passed to Linker::makeLink(): "' . $title . "\"\n" ); $result = $text == "" ? $title : $text; } @@ -1769,12 +1773,12 @@ class Linker { * @param $prefix String: Optional prefix * @param $aprops String: extra attributes to the a-element */ - function makeKnownLink( $title, $text = '', $query = '', $trail = '', $prefix = '',$aprops = '') { + function makeKnownLink( $title, $text = '', $query = '', $trail = '', $prefix = '', $aprops = '' ) { $nt = Title::newFromText( $title ); if ( $nt instanceof Title ) { return $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix , $aprops ); } else { - wfDebug( 'Invalid title passed to Linker::makeKnownLink(): "'.$title."\"\n" ); + wfDebug( 'Invalid title passed to Linker::makeKnownLink(): "' . $title . "\"\n" ); return $text == '' ? $title : $text; } } @@ -1797,7 +1801,7 @@ class Linker { if ( $nt instanceof Title ) { return $this->makeBrokenLinkObj( $nt, $text, $query, $trail ); } else { - wfDebug( 'Invalid title passed to Linker::makeBrokenLink(): "'.$title."\"\n" ); + wfDebug( 'Invalid title passed to Linker::makeBrokenLink(): "' . $title . "\"\n" ); return $text == '' ? $title : $text; } } @@ -1821,7 +1825,7 @@ class Linker { if ( $nt instanceof Title ) { return $this->makeStubLinkObj( $nt, $text, $query, $trail ); } else { - wfDebug( 'Invalid title passed to Linker::makeStubLink(): "'.$title."\"\n" ); + wfDebug( 'Invalid title passed to Linker::makeStubLink(): "' . $title . "\"\n" ); return $text == '' ? $title : $text; } } @@ -1842,12 +1846,12 @@ class Linker { * the end of the link. * @param $prefix String: optional prefix. As trail, only before instead of after. */ - function makeLinkObj( $nt, $text= '', $query = '', $trail = '', $prefix = '' ) { + function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) { wfProfileIn( __METHOD__ ); $query = wfCgiToArray( $query ); list( $inside, $trail ) = Linker::splitTrail( $trail ); - if( $text === '' ) { + if ( $text === '' ) { $text = $this->linkText( $nt ); } @@ -1910,7 +1914,7 @@ class Linker { wfProfileIn( __METHOD__ ); list( $inside, $trail ) = Linker::splitTrail( $trail ); - if( $text === '' ) { + if ( $text === '' ) { $text = $this->linkText( $title ); } @@ -1935,7 +1939,7 @@ class Linker { * @param $prefix String: Optional prefix */ function makeStubLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) { - //wfDeprecated( __METHOD__ ); + // wfDeprecated( __METHOD__ ); return $this->makeColouredLinkObj( $nt, 'stub', $text, $query, $trail, $prefix ); } @@ -1954,8 +1958,8 @@ class Linker { * @param $prefix String: Optional prefix */ function makeColouredLinkObj( $nt, $colour, $text = '', $query = '', $trail = '', $prefix = '' ) { - //wfDeprecated( __METHOD__ ); - if($colour != ''){ + // wfDeprecated( __METHOD__ ); + if ( $colour != '' ) { $style = $this->getInternalLinkAttributesObj( $nt, $text, $colour ); } else $style = ''; return $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix, '', $style ); @@ -2034,7 +2038,7 @@ class Linker { */ public function editSectionLink( Title $nt, $section, $hint = '' ) { wfDeprecated( __METHOD__ ); - if( $hint === '' ) { + if ( $hint === '' ) { # No way to pass an actual empty $hint here! The new interface al- # lows this, so we have to do this for compatibility. $hint = null;