makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #840 from p/ticket/10829

Browse source 
Ticket/10829 Fix some style name/path disagreements
This commit is contained in:
Nils Adermann 2012-06-11 18:10:05 -07:00
commit e045a80d8d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/functions.php
View file

@ -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_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_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_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'], '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, 'S_JQUERY_FALLBACK' => ($config['load_jquery_cdn']) ? true : false,

6
phpBB/includes/style/style.php
View file

@ -89,9 +89,9 @@ class phpbb_style
*/ */
public function set_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(); $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) foreach ($style_dirs as $dir)
{ {
$paths[] = $this->get_style_path($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 // Add 'all' path, used as last fallback path by hooks and extensions
$paths[] = $this->get_style_path('all'); $paths[] = $this->get_style_path('all');
return $this->set_custom_style($style_name, $paths); return $this->set_custom_style($style_path, $paths);
} }
/** /**