aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-03-17 11:40:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-03-17 11:40:56 +0000
commit0ebe5b4b6a57723ccd3bd7cdd05779af91a8e576 (patch)
treeedbcb19a3b57ad7bd85ffae2b7f14580e3c2cb13 /phpBB
parentd6ef1e47468a10ea4199978c1eac4cf0112ca449 (diff)
downloadforums-0ebe5b4b6a57723ccd3bd7cdd05779af91a8e576.tar
forums-0ebe5b4b6a57723ccd3bd7cdd05779af91a8e576.tar.gz
forums-0ebe5b4b6a57723ccd3bd7cdd05779af91a8e576.tar.bz2
forums-0ebe5b4b6a57723ccd3bd7cdd05779af91a8e576.tar.xz
forums-0ebe5b4b6a57723ccd3bd7cdd05779af91a8e576.zip
#42985 - use path in JS instead of name
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9381 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/acp_styles.html2
-rw-r--r--phpBB/includes/acp/acp_styles.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 3642628d08..c93d8b7d2d 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -54,7 +54,7 @@
// <![CDATA[
function update_image(newimage)
{
- document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
+ document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
}
// ]]>
</script>
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index be41bed8b2..528f9e002d 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1533,6 +1533,8 @@ parse_css_file = {PARSE_CSS_FILE}
'U_BACK' => $this->u_action,
'NAME' => $imageset_name,
'A_NAME' => addslashes($imageset_name),
+ 'PATH' => $imageset_path,
+ 'A_PATH' => addslashes($imageset_path),
'ERROR' => !$valid_name,
'IMG_SRC' => ($image_found) ? '../styles/' . $imageset_path . '/imageset/' . $img_val : 'images/no_image.png',
'IMAGE_SELECT' => $image_found