Merge remote-tracking branch 'upstream/develop' into user-contact

[friendica.git] / src / Core / L10n.php

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index dc31b418325b1bd453f0194fca6703ff2c519eb6..2a2988341f662e8af6ebc6663ff8cea3251b3995 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -314,7 +314,7 @@ class L10n
 
                if (is_null($s) && $this->stringPluralSelectDefault($count)) {
                        $s = $plural;
-               } else {
+               } elseif (is_null($s)) {
                        $s = $singular;
                }