[MediaWiki-commits] [Gerrit] Fix variable name and use isset() to shut up a stupid notice - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix variable name and use isset() to shut up a stupid notice .. Fix variable name and use isset() to shut up a stupid notice We've had to reapply this small core hack on ShoutWiki basically after each core upgrade since MW 1.23 (at least). ShoutWiki SVN r2565, r2819 Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175 (cherry picked from commit 01504ab3417fb05806892ac50748bd623868d1ee) --- M RELEASE-NOTES-1.25 M includes/specials/SpecialVersion.php 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index ff86f7b..94f3cba 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -18,6 +18,8 @@ trigger warnings. * (T86156) Running updateSearchIndex.php will not throw an error as page_restrictions has been added to the locked table list. +* Special:Version would throw notices if using SVN due to an incorrectly + named variable. Add an additional check that an index is defined. === Changes since 1.25 === * (T100351) Fix syntax errors in extension.json of ConfirmEdit extension @@ -527,7 +529,6 @@ * The global importScriptURI and importStylesheetURI functions, as well as the loadedScripts object, from wikibits.js (deprecated since 1.17) now emit warnings through mw.log.warn when accessed. - == Compatibility == diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index c1a9593..9a1c5e5 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -265,8 +265,8 @@ $version = $wgVersion . ' ' . wfMessage( 'version-svn-revision', - isset( $info['directory-rev'] ) ? $info['directory-rev'] : '', - $info['checkout-rev'] + isset( $svnInfo['directory-rev'] ) ? $svnInfo['directory-rev'] : '', + isset( $svnInfo['checkout-rev'] ) ? $svnInfo['checkout-rev'] : '' )-text(); } -- To view, visit https://gerrit.wikimedia.org/r/219445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Lewis Cawte le...@lewiscawte.me Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix variable name and use isset() to shut up a stupid notice - change (mediawiki/core)
Lewis Cawte has uploaded a new change for review. https://gerrit.wikimedia.org/r/219445 Change subject: Fix variable name and use isset() to shut up a stupid notice .. Fix variable name and use isset() to shut up a stupid notice We've had to reapply this small core hack on ShoutWiki basically after each core upgrade since MW 1.23 (at least). ShoutWiki SVN r2565, r2819 Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175 (cherry picked from commit 01504ab3417fb05806892ac50748bd623868d1ee) --- M includes/specials/SpecialVersion.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/45/219445/1 diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index c1a9593..9a1c5e5 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -265,8 +265,8 @@ $version = $wgVersion . ' ' . wfMessage( 'version-svn-revision', - isset( $info['directory-rev'] ) ? $info['directory-rev'] : '', - $info['checkout-rev'] + isset( $svnInfo['directory-rev'] ) ? $svnInfo['directory-rev'] : '', + isset( $svnInfo['checkout-rev'] ) ? $svnInfo['checkout-rev'] : '' )-text(); } -- To view, visit https://gerrit.wikimedia.org/r/219445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Lewis Cawte le...@lewiscawte.me Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix variable name and use isset() to shut up a stupid notice - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix variable name and use isset() to shut up a stupid notice .. Fix variable name and use isset() to shut up a stupid notice We've had to reapply this small core hack on ShoutWiki basically after each core upgrade since MW 1.23 (at least). ShoutWiki SVN r2565, r2819 Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175 --- M includes/specials/SpecialVersion.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index c1a9593..9a1c5e5 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -265,8 +265,8 @@ $version = $wgVersion . ' ' . wfMessage( 'version-svn-revision', - isset( $info['directory-rev'] ) ? $info['directory-rev'] : '', - $info['checkout-rev'] + isset( $svnInfo['directory-rev'] ) ? $svnInfo['directory-rev'] : '', + isset( $svnInfo['checkout-rev'] ) ? $svnInfo['checkout-rev'] : '' )-text(); } -- To view, visit https://gerrit.wikimedia.org/r/204254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org Gerrit-Reviewer: TTO at.li...@live.com.au Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
