aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-11-30 21:23:00 +0100
committerJoas Schilling <nickvergessen@gmx.de>2011-11-30 21:23:00 +0100
commit65e6ab55302e5d0c30fa86e06a460fed8167b84a (patch)
tree18bee1fec71cd1b0fdc6c42cab4cac3e33a077ed /phpBB/includes
parentdd99675f7223b0fb659e4146544969e2aa978fa9 (diff)
downloadforums-65e6ab55302e5d0c30fa86e06a460fed8167b84a.tar
forums-65e6ab55302e5d0c30fa86e06a460fed8167b84a.tar.gz
forums-65e6ab55302e5d0c30fa86e06a460fed8167b84a.tar.bz2
forums-65e6ab55302e5d0c30fa86e06a460fed8167b84a.tar.xz
forums-65e6ab55302e5d0c30fa86e06a460fed8167b84a.zip
[ticket/10345] Return the language key when the key has an empty array
PHPBB3-10345
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/session.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 808d1a4a7f..401cb0d371 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1862,6 +1862,11 @@ class user extends session
$args[0] = $lang;
return call_user_func_array('sprintf', $args);
}
+ else if (sizeof($lang) == 0)
+ {
+ // If the language entry is an empty array, we just return the language key
+ return $args[0];
+ }
// It is an array... now handle different nullar/singular/plural forms
$key_found = false;