[MediaWiki-commits] [Gerrit] Fix spacing between two functions - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix spacing between two functions .. Fix spacing between two functions Added and removed some new lines to have one new line between two functions Change-Id: I1ccfbd575dd26b160396ef3d3e2e079f5cdbe196 --- M includes/Html.php M includes/Pager.php M includes/Sanitizer.php M includes/Skin.php M includes/parser/Parser.php M includes/parser/Preprocessor_Hash.php M includes/resourceloader/ResourceLoaderStartUpModule.php M includes/revisiondelete/RevisionDelete.php M includes/search/SearchEngine.php M includes/search/SearchOracle.php M includes/search/SearchPostgres.php M includes/specialpage/SpecialPage.php M includes/specials/SpecialStatistics.php M includes/specials/SpecialUpload.php M maintenance/benchmarks/bench_strtr_str_replace.php 15 files changed, 21 insertions(+), 2 deletions(-) Approvals: IAlex: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Html.php b/includes/Html.php index 0eb6474..c4fc29a 100644 --- a/includes/Html.php +++ b/includes/Html.php @@ -689,6 +689,7 @@ } return self::element( 'textarea', $attribs, $spacedValue ); } + /** * Build a drop-down box for selecting a namespace * diff --git a/includes/Pager.php b/includes/Pager.php index 6a10e88..747d2c1 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -249,6 +249,7 @@ function setOffset( $offset ) { $this->mOffset = $offset; } + /** * Set the limit from an other source than the request * diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index 53bb8fb..dd87b06 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -1302,6 +1302,7 @@ array( 'Sanitizer', 'normalizeCharReferencesCallback' ), $text ); } + /** * @param string $matches * @return string diff --git a/includes/Skin.php b/includes/Skin.php index 5fa01ae..9312a0d 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1249,6 +1249,7 @@ wfProfileOut( __METHOD__ ); return $bar; } + /** * Add content from a sidebar system message * Currently only used for MediaWiki:Sidebar (but may be used by Extensions) diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index e3d7fdf..915beba 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -1684,6 +1684,7 @@ wfProfileOut( __METHOD__ ); return $s; } + /** * Get the rel attribute for a particular external link. * @@ -1703,6 +1704,7 @@ } return null; } + /** * Get an associative array of additional HTML attributes appropriate for a * particular external link. This currently may include rel => nofollow diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index 53e79d4..deaf288 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -1385,6 +1385,7 @@ $s .= '}'; return $s; } + /** * Returns true if there are no arguments in this frame * diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 9ae7795..64fafd7 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -221,7 +221,6 @@ return wfAppendQuery( wfScript( 'load' ), $query ); } - /** * @param $context ResourceLoaderContext * @return string diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php index 0509008..7992882 100644 --- a/includes/revisiondelete/RevisionDelete.php +++ b/includes/revisiondelete/RevisionDelete.php @@ -687,6 +687,7 @@ } return '' . $link . ''; } + /** * Generate a user tool link cluster if the current user is allowed to view it * @return string HTML diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index eea723b..45d0044 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -439,6 +439,7 @@ $lc = $this->legalSearchChars(); return trim( preg_replace( "/[^{$lc}]/", " ", $text ) ); } + /** * Load up the appropriate search engine class for the currently * active database backend, and return a configured instance. @@ -775,6 +776,7 @@ $result->initFromTitle( $title ); return $result; } + /** *
[MediaWiki-commits] [Gerrit] Fix spacing between two functions - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/118823 Change subject: Fix spacing between two functions .. Fix spacing between two functions Added and removed some new lines to have one new line between two functions Change-Id: I1ccfbd575dd26b160396ef3d3e2e079f5cdbe196 --- M includes/Html.php M includes/Pager.php M includes/Sanitizer.php M includes/Skin.php M includes/parser/Parser.php M includes/parser/Preprocessor_Hash.php M includes/resourceloader/ResourceLoaderStartUpModule.php M includes/revisiondelete/RevisionDelete.php M includes/search/SearchEngine.php M includes/search/SearchOracle.php M includes/search/SearchPostgres.php M includes/specialpage/SpecialPage.php M includes/specials/SpecialStatistics.php M includes/specials/SpecialUpload.php M maintenance/benchmarks/bench_strtr_str_replace.php 15 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/23/118823/1 diff --git a/includes/Html.php b/includes/Html.php index 0eb6474..c4fc29a 100644 --- a/includes/Html.php +++ b/includes/Html.php @@ -689,6 +689,7 @@ } return self::element( 'textarea', $attribs, $spacedValue ); } + /** * Build a drop-down box for selecting a namespace * diff --git a/includes/Pager.php b/includes/Pager.php index 6a10e88..747d2c1 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -249,6 +249,7 @@ function setOffset( $offset ) { $this->mOffset = $offset; } + /** * Set the limit from an other source than the request * diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index 53bb8fb..dd87b06 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -1302,6 +1302,7 @@ array( 'Sanitizer', 'normalizeCharReferencesCallback' ), $text ); } + /** * @param string $matches * @return string diff --git a/includes/Skin.php b/includes/Skin.php index 6722cca..28cd037 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1247,6 +1247,7 @@ wfProfileOut( __METHOD__ ); return $bar; } + /** * Add content from a sidebar system message * Currently only used for MediaWiki:Sidebar (but may be used by Extensions) diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index e3d7fdf..915beba 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -1684,6 +1684,7 @@ wfProfileOut( __METHOD__ ); return $s; } + /** * Get the rel attribute for a particular external link. * @@ -1703,6 +1704,7 @@ } return null; } + /** * Get an associative array of additional HTML attributes appropriate for a * particular external link. This currently may include rel => nofollow diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index 53e79d4..deaf288 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -1385,6 +1385,7 @@ $s .= '}'; return $s; } + /** * Returns true if there are no arguments in this frame * diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 9ae7795..64fafd7 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -221,7 +221,6 @@ return wfAppendQuery( wfScript( 'load' ), $query ); } - /** * @param $context ResourceLoaderContext * @return string diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php index 0509008..7992882 100644 --- a/includes/revisiondelete/RevisionDelete.php +++ b/includes/revisiondelete/RevisionDelete.php @@ -687,6 +687,7 @@ } return '' . $link . ''; } + /** * Generate a user tool link cluster if the current user is allowed to view it * @return string HTML diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index eea723b..45d0044 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -439,6 +439,7 @@ $lc = $this->legalSearchChars(); return trim( preg_replace( "/[^{$lc}]/", " ", $text ) ); } + /** * Load up the appropriate search engine class for the currently * active database backend, and return a configured instance. @@ -775,6 +776,7 @@ $result->initFromTitle( $title ); ret