5 files changed, 12 insertions, 11 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f9f4c97309..efb8b3ebd7 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2114,7 +2114,7 @@ class phpbb_db_tools
 
 			case 'mysql_40':
 			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX (' . implode(', ', $column) . ')';
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
 			break;
 
 			case 'mssql':
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index aae200df55..f608c95fe4 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -211,7 +211,7 @@ class messenger
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
 			$tpl = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
-			$stl = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
+			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 			$this->tpl_msg[$template_lang . $template_file] = $tpl;
 
 			$fallback_template_path = false;
@@ -230,7 +230,7 @@ class messenger
 				}
 			}
 
-			$stl->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), '');
+			$style->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), '');
 
 			$tpl->set_filenames(array(
 				'body'		=> $template_file . '.txt',
diff --git a/phpBB/includes/style/template.php b/phpBB/includes/style/template.php
index 3f15355f7a..9d476e74b9 100644
--- a/phpBB/includes/style/template.php
+++ b/phpBB/includes/style/template.php
@@ -507,6 +507,9 @@ class phpbb_style_template
 			$file = $this->locator->get_first_file_location(array($file), true, true);
 		}
 
+		$file .= (strpos($file, '?') === false) ? '?' : '&';
+		$file .= 'assets_version=' . $this->config['assets_version'];
+
 		// Add HTML code
 		$code = '<script src="' . htmlspecialchars($file) . '"></script>';
 		$this->context->append_var('SCRIPTS', $code);
diff --git a/phpBB/includes/style/template_filter.php b/phpBB/includes/style/template_filter.php
index f9bbcce4b2..6ef9d80a3d 100644
--- a/phpBB/includes/style/template_filter.php
+++ b/phpBB/includes/style/template_filter.php
@@ -138,7 +138,7 @@ class phpbb_style_template_filter extends php_user_filter
 	/**
 	* Initializer, called on creation.
 	*
-	* Get the allow_php option, root directory and locator from params, 
+	* Get the allow_php option, root directory and locator from params,
 	* which are passed to stream_filter_append.
 	*/
 	public function onCreate()
@@ -882,8 +882,6 @@ class phpbb_style_template_filter extends php_user_filter
 	*/
 	private function compile_tag_include_js($tag_args)
 	{
-		global $config;
-
 		// Process dynamic includes
 		if ($tag_args[0] == '{')
 		{
@@ -896,14 +894,14 @@ class phpbb_style_template_filter extends php_user_filter
 		}
 
 		// Locate file
-		$filename = $this->locator->get_first_file_location(array($tag_args), false, true) . '?assets_version=' . $config['assets_version'];
-		
+		$filename = $this->locator->get_first_file_location(array($tag_args), false, true);
+
 		if ($filename === false)
 		{
 			// File does not exist, find it during run time
 			return ' $_template->_js_include(\'' . addslashes($tag_args) . '\', true); ';
 		}
-		
+
 		if (substr($filename, 0, strlen($this->phpbb_root_path)) != $this->phpbb_root_path)
 		{
 			// Absolute path, include as is
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index 1676f82ccb..ce9c804f23 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -72,7 +72,7 @@ class phpbb_user extends phpbb_session
 	*/
 	function setup($lang_set = false, $style_id = false)
 	{
-		global $db, $style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
+		global $db, $phpbb_style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
 
 		if ($this->data['user_id'] != ANONYMOUS)
 		{
@@ -206,7 +206,7 @@ class phpbb_user extends phpbb_session
 			}
 		}
 
-		$style->set_style();
+		$phpbb_style->set_style();
 
 		$this->img_lang = $this->lang_name;