diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-22 15:45:48 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-22 15:45:48 -0500 |
| commit | 37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b (patch) | |
| tree | eab75a0522afea3b8b6413439fb86420c728a5bf /phpBB/style.php | |
| parent | 51f8f642de537ee826a1da07b6b06374df9fc236 (diff) | |
| parent | 1842323ca9a59b8cc34c1af43db6d703cf996d33 (diff) | |
| download | forums-37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b.tar forums-37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b.tar.gz forums-37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b.tar.bz2 forums-37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b.tar.xz forums-37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus
* cyberalien/ticket/10399:
[ticket/10399] Correctly encoding template component urls (3.0)
[ticket/10399] Correctly encoding template component urls (3.0)
Diffstat (limited to 'phpBB/style.php')
| -rw-r--r-- | phpBB/style.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/style.php b/phpBB/style.php index 916aa8ce5c..f1b41c6a85 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -216,10 +216,10 @@ if ($id) // Parse Theme Data $replace = array( - '{T_THEME_PATH}' => "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme', - '{T_TEMPLATE_PATH}' => "{$phpbb_root_path}styles/" . $theme['template_path'] . '/template', - '{T_IMAGESET_PATH}' => "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset', - '{T_IMAGESET_LANG_PATH}' => "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset/' . $user_image_lang, + '{T_THEME_PATH}' => "{$phpbb_root_path}styles/" . rawurlencode($theme['theme_path']) . '/theme', + '{T_TEMPLATE_PATH}' => "{$phpbb_root_path}styles/" . rawurlencode($theme['template_path']) . '/template', + '{T_IMAGESET_PATH}' => "{$phpbb_root_path}styles/" . rawurlencode($theme['imageset_path']) . '/imageset', + '{T_IMAGESET_LANG_PATH}' => "{$phpbb_root_path}styles/" . rawurlencode($theme['imageset_path']) . '/imageset/' . $user_image_lang, '{T_STYLESHEET_NAME}' => $theme['theme_name'], '{S_USER_LANG}' => $user['user_lang'] ); @@ -248,7 +248,7 @@ if ($id) $img_data = &$img_array[$img]; $imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename']; $imgs[$img] = array( - 'src' => $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc, + 'src' => $phpbb_root_path . 'styles/' . rawurlencode($theme['imageset_path']) . '/imageset/' . $imgsrc, 'width' => $img_data['image_width'], 'height' => $img_data['image_height'], ); |