diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-06-11 18:10:05 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-06-11 18:10:05 -0700 |
| commit | e045a80d8d9257ef29557aef34383b7152698be9 (patch) | |
| tree | eccc4086e6739d0e263d82399af761be4a4fc35d /phpBB/includes | |
| parent | 436ade19fcef64ea5f5cd399018d0c7e9289452b (diff) | |
| parent | 2a9698a13a5df8ff6c3b62df0674de07ebebdfc9 (diff) | |
| download | forums-e045a80d8d9257ef29557aef34383b7152698be9.tar forums-e045a80d8d9257ef29557aef34383b7152698be9.tar.gz forums-e045a80d8d9257ef29557aef34383b7152698be9.tar.bz2 forums-e045a80d8d9257ef29557aef34383b7152698be9.tar.xz forums-e045a80d8d9257ef29557aef34383b7152698be9.zip | |
Merge pull request #840 from p/ticket/10829
Ticket/10829 Fix some style name/path disagreements
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/style/style.php | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ddbe1c2c36..e40df93194 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4784,7 +4784,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_UPLOAD_PATH' => "{$web_path}{$config['upload_path']}/", 'T_STYLESHEET_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/stylesheet.css?assets_version=' . $config['assets_version'], 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'], - 'T_STYLESHEET_NAME' => $user->style['style_name'], 'T_JQUERY_LINK' => ($config['load_jquery_cdn'] && !empty($config['load_jquery_url'])) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery.js?assets_version=" . $config['assets_version'], 'S_JQUERY_FALLBACK' => ($config['load_jquery_cdn']) ? true : false, diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 8d38deb85c..22e0f1d67a 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -89,9 +89,9 @@ class phpbb_style */ public function set_style() { - $style_name = $this->user->style['style_path']; + $style_path = $this->user->style['style_path']; $style_dirs = ($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array(); - $paths = array($this->get_style_path($style_name)); + $paths = array($this->get_style_path($style_path)); foreach ($style_dirs as $dir) { $paths[] = $this->get_style_path($dir); @@ -100,7 +100,7 @@ class phpbb_style // Add 'all' path, used as last fallback path by hooks and extensions $paths[] = $this->get_style_path('all'); - return $this->set_custom_style($style_name, $paths); + return $this->set_custom_style($style_path, $paths); } /** |