"
+ . "
";
+
if ( !$exists ) {
$s .= self::makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time == true );
$zoomIcon = '';
@@ -845,7 +860,9 @@ class Linker {
$params = array(
'alt' => $fp['alt'],
'title' => $fp['title'],
- 'img-class' => ( isset( $fp['class'] ) && $fp['class'] !== '' ? $fp['class'] . ' ' : '' ) . 'thumbimage'
+ 'img-class' => ( isset( $fp['class'] ) && $fp['class'] !== ''
+ ? $fp['class'] . ' '
+ : '' ) . 'thumbimage'
);
$params = self::getImageLinkMTOParams( $fp, $query ) + $params;
$s .= $thumb->toHtml( $params );
@@ -858,7 +875,8 @@ class Linker {
'class' => 'internal',
'title' => wfMessage( 'thumbnail-more' )->text() ),
Html::element( 'img', array(
- 'src' => $wgStylePath . '/common/images/magnify-clip' . ( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png',
+ 'src' => $wgStylePath . '/common/images/magnify-clip'
+ . ( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png',
'width' => 15,
'height' => 11,
'alt' => "" ) ) ) );
@@ -910,7 +928,9 @@ class Linker {
* @param bool $time A file of a certain timestamp was requested
* @return string
*/
- public static function makeBrokenImageLinkObj( $title, $label = '', $query = '', $unused1 = '', $unused2 = '', $time = false ) {
+ public static function makeBrokenImageLinkObj( $title, $label = '',
+ $query = '', $unused1 = '', $unused2 = '', $time = false
+ ) {
global $wgEnableUploads, $wgUploadMissingFileUrl, $wgUploadNavigationUrl;
if ( ! $title instanceof Title ) {
return "" . htmlspecialchars( $label );
@@ -922,7 +942,9 @@ class Linker {
$encLabel = htmlspecialchars( $label );
$currentExists = $time ? ( wfFindFile( $title ) != false ) : false;
- if ( ( $wgUploadMissingFileUrl || $wgUploadNavigationUrl || $wgEnableUploads ) && !$currentExists ) {
+ if ( ( $wgUploadMissingFileUrl || $wgUploadNavigationUrl || $wgEnableUploads )
+ && !$currentExists
+ ) {
$redir = RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title );
if ( $redir ) {
@@ -1013,7 +1035,8 @@ class Linker {
if ( !wfRunHooks( 'LinkerMakeMediaLinkFile',
array( $title, $file, &$html, &$attribs, &$ret ) ) ) {
- wfDebug( "Hook LinkerMakeMediaLinkFile changed the output of link with url {$url} and text {$html} to {$ret}\n", true );
+ wfDebug( "Hook LinkerMakeMediaLinkFile changed the output of link "
+ . "with url {$url} and text {$html} to {$ret}\n", true );
return $ret;
}
@@ -1047,7 +1070,9 @@ class Linker {
* @param Title|null $title Title object used for title specific link attributes
* @return string
*/
- public static function makeExternalLink( $url, $text, $escape = true, $linktype = '', $attribs = array(), $title = null ) {
+ public static function makeExternalLink( $url, $text, $escape = true,
+ $linktype = '', $attribs = array(), $title = null
+ ) {
global $wgTitle;
$class = "external";
if ( $linktype ) {
@@ -1070,7 +1095,8 @@ class Linker {
$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 );
+ wfDebug( "Hook LinkerMakeExternalLink changed the output of link "
+ . "with url {$url} and text {$text} to {$link}\n", true );
return $link;
}
$attribs['href'] = $url;
@@ -1111,7 +1137,8 @@ class Linker {
* @param string $userText User name or IP address
* @param bool $redContribsWhenNoEdits Should the contributions link be
* red if the user has no edits?
- * @param int $flags Customisation flags (e.g. Linker::TOOL_LINKS_NOBLOCK and Linker::TOOL_LINKS_EMAIL)
+ * @param int $flags Customisation flags (e.g. Linker::TOOL_LINKS_NOBLOCK
+ * and Linker::TOOL_LINKS_EMAIL).
* @param int $edits User edit count (optional, for performance)
* @return string HTML fragment
*/
@@ -1285,11 +1312,11 @@ class Linker {
return $comment;
}
- /**
- * @var Title
- */
- static $autocommentTitle;
- static $autocommentLocal;
+ /** @var Title */
+ private static $autocommentTitle;
+
+ /** @var bool Whether section links should refer to local page */
+ private static $autocommentLocal;
/**
* Converts autogenerated comments in edit summaries into section links.
@@ -1367,16 +1394,17 @@ class Linker {
$auto .= wfMessage( 'colon-separator' )->inContentLanguage()->escaped();
}
$auto = '';
- $comment = $pre . $link . $wgLang->getDirMark() . '' . $auto . $post . '';
+ $comment = $pre . $link . $wgLang->getDirMark()
+ . '' . $auto . $post . '';
}
return $comment;
}
- /**
- * @var Title
- */
- static $commentContextTitle;
- static $commentLocal;
+ /** @var Title */
+ private static $commentContextTitle;
+
+ /** @var bool Whether section links should refer to local page */
+ private static $commentLocal;
/**
* Formats wiki links and media links in text; all other wiki formatting
@@ -1477,7 +1505,12 @@ class Linker {
}
if ( $thelink ) {
// If the link is still valid, go ahead and replace it in!
- $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 );
+ $comment = preg_replace(
+ $linkRegexp,
+ StringUtils::escapeRegexReplacement( $thelink ),
+ $comment,
+ 1
+ );
}
return $comment;
@@ -1736,7 +1769,9 @@ class Linker {
*
* @return string HTML headline
*/
- public static function makeHeadline( $level, $attribs, $anchor, $html, $link, $legacyAnchor = false ) {
+ public static function makeHeadline( $level, $attribs, $anchor, $html,
+ $link, $legacyAnchor = false
+ ) {
$ret = "$html"
. $link
@@ -1792,10 +1827,13 @@ class Linker {
* @param array $options
* @return string
*/
- public static function generateRollback( $rev, IContextSource $context = null, $options = array( 'verify' ) ) {
+ public static function generateRollback( $rev, IContextSource $context = null,
+ $options = array( 'verify' )
+ ) {
if ( $context === null ) {
$context = RequestContext::getMain();
}
+
$editCount = false;
if ( in_array( 'verify', $options ) ) {
$editCount = self::getRollbackEditCount( $rev, true );
@@ -1855,9 +1893,13 @@ class Linker {
$moreRevs = false;
foreach ( $res as $row ) {
if ( $rev->getRawUserText() != $row->rev_user_text ) {
- if ( $verify && ( $row->rev_deleted & Revision::DELETED_TEXT || $row->rev_deleted & Revision::DELETED_USER ) ) {
- // If the user or the text of the revision we might rollback to is deleted in some way we can't rollback
- // Similar to the sanity checks in WikiPage::commitRollback
+ if ( $verify &&
+ ( $row->rev_deleted & Revision::DELETED_TEXT
+ || $row->rev_deleted & Revision::DELETED_USER
+ ) ) {
+ // If the user or the text of the revision we might rollback
+ // to is deleted in some way we can't rollback. Similar to
+ // the sanity checks in WikiPage::commitRollback.
return false;
}
$moreRevs = true;
@@ -1883,7 +1925,9 @@ class Linker {
* @param int $editCount Number of edits that would be reverted
* @return string HTML fragment
*/
- public static function buildRollbackLink( $rev, IContextSource $context = null, $editCount = false ) {
+ public static function buildRollbackLink( $rev, IContextSource $context = null,
+ $editCount = false
+ ) {
global $wgShowRollbackEditCount, $wgMiserMode;
// To config which pages are effected by miser mode
@@ -1897,7 +1941,10 @@ class Linker {
$query = array(
'action' => 'rollback',
'from' => $rev->getUserText(),
- 'token' => $context->getUser()->getEditToken( array( $title->getPrefixedText(), $rev->getUserText() ) ),
+ 'token' => $context->getUser()->getEditToken( array(
+ $title->getPrefixedText(),
+ $rev->getUserText()
+ ) ),
);
if ( $context->getRequest()->getBool( 'bot' ) ) {
$query['bot'] = '1';
@@ -1914,13 +1961,17 @@ class Linker {
}
}
- if ( !$disableRollbackEditCount && is_int( $wgShowRollbackEditCount ) && $wgShowRollbackEditCount > 0 ) {
+ if ( !$disableRollbackEditCount
+ && is_int( $wgShowRollbackEditCount )
+ && $wgShowRollbackEditCount > 0
+ ) {
if ( !is_numeric( $editCount ) ) {
$editCount = self::getRollbackEditCount( $rev, false );
}
if ( $editCount > $wgShowRollbackEditCount ) {
- $editCount_output = $context->msg( 'rollbacklinkcount-morethan' )->numParams( $wgShowRollbackEditCount )->parse();
+ $editCount_output = $context->msg( 'rollbacklinkcount-morethan' )
+ ->numParams( $wgShowRollbackEditCount )->parse();
} else {
$editCount_output = $context->msg( 'rollbacklinkcount' )->numParams( $editCount )->parse();
}
@@ -1958,7 +2009,9 @@ class Linker {
* @param Title|Message|string|null $more An escaped link for "More..." of the templates
* @return string HTML output
*/
- public static function formatTemplates( $templates, $preview = false, $section = false, $more = null ) {
+ public static function formatTemplates( $templates, $preview = false,
+ $section = false, $more = null
+ ) {
global $wgLang;
wfProfileIn( __METHOD__ );
@@ -2062,7 +2115,10 @@ class Linker {
$outText .= "
\n";
foreach ( $hiddencats as $titleObj ) {
- $outText .= '- ' . self::link( $titleObj, null, array(), array(), 'known' ) . "
\n"; # If it's hidden, it must exist - no need to check with a LinkBatch
+ # If it's hidden, it must exist - no need to check with a LinkBatch
+ $outText .= '- '
+ . self::link( $titleObj, null, array(), array(), 'known' )
+ . "
\n";
}
$outText .= '
';
}
@@ -2128,7 +2184,7 @@ class Linker {
return $tooltip;
}
- static $accesskeycache;
+ private static $accesskeycache;
/**
* Given the id of an interface element, constructs the appropriate
@@ -2225,7 +2281,11 @@ class Linker {
$html = wfMessage( $msgKey )->escaped();
$tag = $restricted ? 'strong' : 'span';
$link = self::link( $sp, $html, array(), $query, array( 'known', 'noclasses' ) );
- return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $link )->escaped() );
+ return Xml::tags(
+ $tag,
+ array( 'class' => 'mw-revdelundel-link' ),
+ wfMessage( 'parentheses' )->rawParams( $link )->escaped()
+ );
}
/**
diff --git a/includes/Revision.php b/includes/Revision.php
index b0423fb323c..86c305764aa 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -524,7 +524,7 @@ class Revision implements IDBAccessObject {
/**
* Constructor
*
- * @param object $row Either a database row or an array
+ * @param object|array $row Either a database row or an array
* @throws MWException
* @access private
*/
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 085404b9dc9..c07fc3a8146 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -702,7 +702,8 @@ class WebInstaller extends Installer {
$html = $this->parse( $text, true );
return "
\n" .
- "escaped() . "\">" .
+ "escaped() . "\">" .
wfMessage( 'config-help' )->escaped() . "\n" .
"" . $html . "\n" .
"
\n";
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 7d8a0b68187..78874479c35 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -88,7 +88,8 @@ class Preprocessor_DOM implements Preprocessor {
if ( !$result ) {
// Try running the XML through UtfNormal to get rid of invalid characters
$xml = UtfNormal::cleanUp( $xml );
- // 1 << 19 == XML_PARSE_HUGE, needed so newer versions of libxml2 don't barf when the XML is >256 levels deep
+ // 1 << 19 == XML_PARSE_HUGE, needed so newer versions of libxml2
+ // don't barf when the XML is >256 levels deep
$result = $dom->loadXML( $xml, 1 << 19 );
}
wfProfileOut( __METHOD__ . '-loadXML' );