11 files changed, 21 insertions, 21 deletions
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index b2eba48ae6..63aebec993 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -12,8 +12,8 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
index c4c3427fdb..775caa7c67 100644
--- a/phpBB/adm/style/installer_header.html
+++ b/phpBB/adm/style/installer_header.html
@@ -6,7 +6,7 @@
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>
 
-	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 747b1291f4..53a91f2700 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_update.html b/phpBB/adm/style/installer_update.html
index 6bcbc525e9..48cc07f5d6 100644
--- a/phpBB/adm/style/installer_update.html
+++ b/phpBB/adm/style/installer_update.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_update_file_status.html b/phpBB/adm/style/installer_update_file_status.html
index 9f15c402e9..a27bfa6a44 100644
--- a/phpBB/adm/style/installer_update_file_status.html
+++ b/phpBB/adm/style/installer_update_file_status.html
@@ -4,7 +4,7 @@
 <p>{L_FILES_DELETED_EXPLAIN}</p>
 
 <fieldset id="deleted">
-	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 	<!-- BEGIN deleted -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
@@ -20,7 +20,7 @@
 <p>{L_FILES_CONFLICT_EXPLAIN}</p>
 
 <fieldset id="conflict">
-	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 	<!-- BEGIN conflict -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
@@ -36,7 +36,7 @@
 <p>{L_FILES_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="modified">
-	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 	<!-- BEGIN modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
@@ -52,7 +52,7 @@
 <p>{L_FILES_NEW_EXPLAIN}</p>
 
 <fieldset id="new_files" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 	<!-- BEGIN new -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
@@ -69,7 +69,7 @@
 <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="not_modified" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
 	<!-- BEGIN not_modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index deb38c8691..8745286d64 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -34,7 +34,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index c08fd931a0..08ee0a739f 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -17,7 +17,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index ed817f7396..2dad42b4b6 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -270,10 +270,10 @@ class helper
 			'L_SELECT_LANG'			=> $this->language->lang('SELECT_LANG'),
 			'L_SKIP'				=> $this->language->lang('SKIP'),
 			'PAGE_TITLE'			=> $this->language->lang($page_title),
-			'T_IMAGE_PATH'			=> $this->path_helper->get_web_root_path() . $path . 'images/',
+			'T_IMAGE_PATH'			=> $this->path_helper->get_web_root_path() . $path . 'images',
 			'T_JQUERY_LINK'			=> $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery.min.js',
-			'T_TEMPLATE_PATH'		=> $this->path_helper->get_web_root_path() . $path . 'style/',
-			'T_ASSETS_PATH'			=> $this->path_helper->get_web_root_path() . $path . '../assets/',
+			'T_TEMPLATE_PATH'		=> $this->path_helper->get_web_root_path() . $path . 'style',
+			'T_ASSETS_PATH'			=> $this->path_helper->get_web_root_path() . $path . '../assets',
 
 			'S_CONTENT_DIRECTION' 	=> $this->language->lang('DIRECTION'),
 			'S_CONTENT_FLOW_BEGIN'	=> ($this->language->lang('DIRECTION') === 'ltr') ? 'left' : 'right',
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index bc71aa0969..874607d913 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -9,6 +9,10 @@
 
 	<p>{L_SEND_IM_EXPLAIN}</p>
 
+	<!-- IF S_SENT_JABBER -->
+		<p>{L_IM_SENT_JABBER}</p>
+	<!-- ENDIF -->
+
 	<fieldset>
 	<dl class="fields2">
 		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
@@ -24,10 +28,6 @@
 			<dt>&nbsp;</dt>
 			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
 		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd>{L_IM_SENT_JABBER}</dd>
-		</dl>
 	<!-- ELSE IF S_NO_SEND_JABBER -->
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 61a370dbae..0573abec64 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -41,7 +41,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 76a58ed218..614c137835 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -25,7 +25,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->