diff -crN 308/includes/functions.php 308.fixed/includes/functions.php
*** 308/includes/functions.php 2010-11-19 18:22:36.000000000 +0600
--- 308.fixed/includes/functions.php 2011-04-10 15:39:16.070312500 +0600
***************
*** 4455,4460 ****
--- 4455,4462 ----
'S_REGISTER_ENABLED' => ($config['require_activation'] != USER_ACTIVATION_DISABLE) ? true : false,
'S_FORUM_ID' => $forum_id,
'S_TOPIC_ID' => $topic_id,
+
+ 'STYLE_COOKIE' => request_var('style_cookie', '', false, true),
'S_LOGIN_ACTION' => ((!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id)),
'S_LOGIN_REDIRECT' => build_hidden_fields(array('redirect' => build_url())),
diff -crN 308/styles/prosilver/template/overall_header.html 308.fixed/styles/prosilver/template/overall_header.html
*** 308/styles/prosilver/template/overall_header.html 2010-11-19 18:22:36.000000000 +0600
--- 308.fixed/styles/prosilver/template/overall_header.html 2011-04-10 15:40:34.351562500 +0600
***************
*** 12,17 ****
--- 12,20 ----
+
+
+
{META}
{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}
***************
*** 91,99 ****
!
!
!
--- 94,102 ----
!
!
!
diff -crN 308/styles/prosilver/template/simple_header.html 308.fixed/styles/prosilver/template/simple_header.html
*** 308/styles/prosilver/template/simple_header.html 2010-11-19 18:22:36.000000000 +0600
--- 308.fixed/styles/prosilver/template/simple_header.html 2011-04-10 15:42:00.547851500 +0600
***************
*** 11,16 ****
--- 11,19 ----
+
+
+
{META}
{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}
***************
*** 53,61 ****
!
!
!
--- 56,64 ----
!
!
!
diff -crN 308/styles/prosilver/template/styleswitcher.js 308.fixed/styles/prosilver/template/styleswitcher.js
*** 308/styles/prosilver/template/styleswitcher.js 2010-11-19 18:22:36.000000000 +0600
--- 308.fixed/styles/prosilver/template/styleswitcher.js 2011-04-10 15:44:16.500976500 +0600
***************
*** 109,129 ****
}
}
}
}
function getActiveStyleSheet()
{
! var i, a;
!
! for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
! {
! if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title') && !a.disabled)
! {
! return a.getAttribute('title');
! }
! }
! return null;
}
function getPreferredStyleSheet()
--- 109,123 ----
}
}
}
+ createCookie('style_cookie', title, 365);
}
function getActiveStyleSheet()
{
! var cookie = readCookie('style_cookie');
! var title = cookie ? cookie : getPreferredStyleSheet();
! return title;
}
function getPreferredStyleSheet()
***************
*** 144,150 ****
expires = '';
}
! document.cookie = name + '=' + value + expires + style_cookie_settings;
}
function readCookie(name)
--- 138,144 ----
expires = '';
}
! document.cookie = name + '=' + urlencode(value) + expires + style_cookie_settings;
}
function readCookie(name)
***************
*** 163,169 ****
if (c.indexOf(nameEQ) == 0)
{
! return c.substring(nameEQ.length, c.length);
}
}
--- 157,163 ----
if (c.indexOf(nameEQ) == 0)
{
! return urldecode(c.substring(nameEQ.length, c.length));
}
}
***************
*** 183,189 ****
createCookie('style_cookie', title, 365);
}
! onload_functions.push('load_cookie()');
onunload_functions.push('unload_cookie()');
/*
--- 177,193 ----
createCookie('style_cookie', title, 365);
}
! function urlencode(str)
! {
! return escape(str).replace(/\+/g,'%2B').replace(/%20/g, '+').replace(/\*/g, '%2A').replace(/\//g, '%2F').replace(/@/g, '%40');
! }
!
! function urldecode(str)
! {
! return unescape(str.replace('+', ' '));
! }
!
! // onload_functions.push('load_cookie()');
onunload_functions.push('unload_cookie()');
/*