Fix get_lang's $returnEmptyIfNotFound param - refs BT#14835

See 47685b1
chamilo · Sep 17, 2018 · 3801ab9 · 3801ab9
1 parent 01dcdb7
commit 3801ab9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php
@@ -148,8 +148,12 @@ function get_lang($variable, $returnEmptyIfNotFound = false, $language = null)
             $langvar = $GLOBALS[$variable];
         } elseif (isset($GLOBALS["lang$variable"])) {
             $langvar = $GLOBALS["lang$variable"];
-        } elseif (!$returnEmptyIfNotFound) {
-            $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
+        } else {
+            if (!$returnEmptyIfNotFound) {
+                $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
+            } else {
+                return '';
+            }
         }
     }
     if (empty($langvar) || !is_string($langvar) && !$returnEmptyIfNotFound) {