diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-21 01:09:18 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-21 01:09:18 +0200 |
| commit | fab0ec64b383c672e91db8524a225671795d4805 (patch) | |
| tree | 4a21e36d8b30119d128669e77b18277ca006fa63 /phpBB/includes/functions.php | |
| parent | 207f2495211fab0400a9f005bc9c307a3f51d335 (diff) | |
| parent | 7b7a56dc4a5f70f8e7ced66fef210e9591bbd929 (diff) | |
| download | forums-fab0ec64b383c672e91db8524a225671795d4805.tar forums-fab0ec64b383c672e91db8524a225671795d4805.tar.gz forums-fab0ec64b383c672e91db8524a225671795d4805.tar.bz2 forums-fab0ec64b383c672e91db8524a225671795d4805.tar.xz forums-fab0ec64b383c672e91db8524a225671795d4805.zip | |
Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into develop
* github-cs278/feature/remove-db-styles:
[feature/remove-db-styles] Remove forgotten template variables.
[feature/remove-db-styles] Removed style.php!
[feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
[feature/remove-db-styles] Update language to reflect removal of db storage.
[feature/remove-db-styles] Mark log entrys as deprecated.
[feature/remove-db-styles] Add error if template/theme file is unwritable.
[feature/remove-db-styles] Add schema changes sinces 3.0.x.
[feature/remove-db-styles] Readd table constant for upgrades etc.
[feature/remove-db-styles] Update database schemas.
[feature/remove-db-styles] Remove style.php DB storage.
[feature/remove-db-styles] Remove parse_css_file option from themes.
[feature/remove-db-styles] Remove DB theme handling code from session.
[feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
[feature/remove-db-styles] Missed a few template DB bits in acp_styles.
[feature/remove-db-styles] Removing unused methods from acp_style.
[feature/remove-db-styles] Removed database storage of style components.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2fa0f89436..5ccb9edd07 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4566,7 +4566,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_ICONS_PATH' => "{$web_path}{$config['icons_path']}/", 'T_RANKS_PATH' => "{$web_path}{$config['ranks_path']}/", 'T_UPLOAD_PATH' => "{$web_path}{$config['upload_path']}/", - 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&lang=' . $user->lang_name), + 'T_STYLESHEET_LINK' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css', 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/' . $user->lang_name . '/stylesheet.css', 'T_STYLESHEET_NAME' => $user->theme['theme_name'], |