mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge remote-tracking branch 'cyberalien/ticket/11754' into develop
* cyberalien/ticket/11754: [ticket/11754] Remove styleswitcher leftovers
This commit is contained in:
commit
55d911a2fd
3 changed files with 0 additions and 6 deletions
|
@ -5390,8 +5390,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
|
||||||
'T_UPLOAD' => $config['upload_path'],
|
'T_UPLOAD' => $config['upload_path'],
|
||||||
|
|
||||||
'SITE_LOGO_IMG' => $user->img('site_logo'),
|
'SITE_LOGO_IMG' => $user->img('site_logo'),
|
||||||
|
|
||||||
'A_COOKIE_SETTINGS' => addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
|
|
||||||
));
|
));
|
||||||
|
|
||||||
// application/xhtml+xml not used because of IE
|
// application/xhtml+xml not used because of IE
|
||||||
|
|
|
@ -30,8 +30,6 @@
|
||||||
var on_page = '{ON_PAGE}';
|
var on_page = '{ON_PAGE}';
|
||||||
var per_page = '{PER_PAGE}';
|
var per_page = '{PER_PAGE}';
|
||||||
var base_url = '{A_BASE_URL}';
|
var base_url = '{A_BASE_URL}';
|
||||||
var style_cookie = 'phpBBstyle';
|
|
||||||
var style_cookie_settings = '{A_COOKIE_SETTINGS}';
|
|
||||||
var onload_functions = new Array();
|
var onload_functions = new Array();
|
||||||
var onunload_functions = new Array();
|
var onunload_functions = new Array();
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,8 @@
|
||||||
var on_page = '{ON_PAGE}';
|
var on_page = '{ON_PAGE}';
|
||||||
var per_page = '{PER_PAGE}';
|
var per_page = '{PER_PAGE}';
|
||||||
var base_url = '{A_BASE_URL}';
|
var base_url = '{A_BASE_URL}';
|
||||||
var style_cookie = 'phpBBstyle';
|
|
||||||
var onload_functions = new Array();
|
var onload_functions = new Array();
|
||||||
var onunload_functions = new Array();
|
var onunload_functions = new Array();
|
||||||
var style_cookie_settings = '{A_COOKIE_SETTINGS}';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* New function for handling multiple calls to window.onload and window.unload by pentapenguin
|
* New function for handling multiple calls to window.onload and window.unload by pentapenguin
|
||||||
|
|
Loading…
Add table
Reference in a new issue