jenkins-bot has submitted this change and it was merged.

Change subject: Move check for non-existing reference count higher up
......................................................................


Move check for non-existing reference count higher up

It doesn't make sense to check for negative numbers or 0 if the
value doesn't even exist. It ends up spamming the warning logs
prior to actually hitting the case we want.

Change-Id: I8f6cf17d4cd628fdcff13f2d29c7ae9661444de2
---
M Cite_body.php
1 file changed, 8 insertions(+), 9 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Cite_body.php b/Cite_body.php
index a36cae2..ee556e7 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -806,7 +806,14 @@
                                        $text
                                )->inContentLanguage()->plain();
                }
-
+               if ( !isset( $val['count'] ) ) {
+                       // this handles the case of section preview for 
list-defined references
+                       return wfMessage( 'cite_references_link_many',
+                                       self::getReferencesKey( $key . "-" . 
$val['key'] ),
+                                       '',
+                                       $text
+                               )->inContentLanguage()->plain();
+               }
                if ( $val['count'] < 0 ) {
                        return wfMessage(
                                        'cite_references_link_one',
@@ -829,14 +836,6 @@
                                        $text
                                )->inContentLanguage()->plain();
                // Named references with >1 occurrences
-               }
-               if ( !isset( $val['count'] ) ) {
-                       // this handles the case of section preview for 
list-defined references
-                       return wfMessage( 'cite_references_link_many',
-                                       self::getReferencesKey( $key . "-" . 
$val['key'] ),
-                                       '',
-                                       $text
-                               )->inContentLanguage()->plain();
                }
                $links = array();
                // for group handling, we have an extra key here.

-- 
To view, visit https://gerrit.wikimedia.org/r/287133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f6cf17d4cd628fdcff13f2d29c7ae9661444de2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to