aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-02-07 16:30:43 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-02-07 16:30:43 +0100
commitdf78a3a62df1c8da5f3a9ff2cfef5815aaf4909c (patch)
tree5dad06a6f89597be7ba8b5ff455036d20dc70f30 /phpBB
parent36a4c410cedf876bf1c532037e8d49a3cb5d86cc (diff)
parent3c04e6db97bb3de860aa42062459f0f44487c557 (diff)
downloadforums-df78a3a62df1c8da5f3a9ff2cfef5815aaf4909c.tar
forums-df78a3a62df1c8da5f3a9ff2cfef5815aaf4909c.tar.gz
forums-df78a3a62df1c8da5f3a9ff2cfef5815aaf4909c.tar.bz2
forums-df78a3a62df1c8da5f3a9ff2cfef5815aaf4909c.tar.xz
forums-df78a3a62df1c8da5f3a9ff2cfef5815aaf4909c.zip
Merge branch 'ticket/nickvergessen/9949' into develop-olympus
* ticket/nickvergessen/9949: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/session.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 5f5b39fe27..1dc854caf2 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1966,6 +1966,7 @@ class user extends session
$key_found = $num;
}
+ break;
}
}