2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1d1c0b78ea..5f633b0dfd 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -872,7 +872,7 @@ class acp_users
 
 					foreach ($var_ary as $var => $default)
 					{
-						$data[$var] = (in_array($var, array('location', 'occupation', 'interests')) ? request_var($var, $default, true) : $data[$var] = request_var($var, $default);
+						$data[$var] = (in_array($var, array('location', 'occupation', 'interests'))) ? request_var($var, $default, true) : $data[$var] = request_var($var, $default);
 					}
 
 					$var_ary = array(
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index 6ed8c4c1ab..540aa329c1 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -259,7 +259,8 @@ class template_compile
 
 		if (strpos($tag_args, '!') === 0)
 		{
-			$no_nesting = substr_count($tag_args, '!', 0, strrpos($tag_args, '!') + 1);
+			// Count the number if ! occurrences (not allowed in vars)
+			$no_nesting = substr_count($tag_args, '!');
 			$tag_args = substr($tag_args, $no_nesting);
 		}
 
@@ -450,7 +451,7 @@ class template_compile
 					{
 						$token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_tpldata[\'.\'][0][\'' . $varrefs[3] . '\']');
 					}
-					else if (preg_match('#^\.([a-z0-9\-_]+\.?)+$#s', $token, $varrefs))
+					else if (preg_match('#^\.(([a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
 					{
 						$_tok = $this->generate_block_data_ref($varrefs[1], false);
 						$token = "(isset($_tok) && sizeof($_tok))";