diff options
| author | czaks <marcin@6irc.net> | 2014-06-10 17:51:03 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-10 17:51:03 +0200 |
| commit | c2cbbe7e225ba74ea5fd033d4672286ceb1e429c (patch) | |
| tree | 0f81cf4182c0f81c28d2d54b13ec79a1d151d364 | |
| parent | c04b4196394b68a1a2105ebc8011460826f56c34 (diff) | |
| parent | 2f55cd9897253213c862f1ae36766ebeb74b7c58 (diff) | |
Merge 4.5
Conflicts:
js/expand-too-long.js
| -rw-r--r-- | inc/mod/auth.php | 4 | ||||
| -rw-r--r-- | inc/mod/pages.php | 2 | ||||
| -rw-r--r-- | js/expand-too-long.js | 2 | ||||
| -rw-r--r-- | templates/themes/basic/index.html | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/inc/mod/auth.php b/inc/mod/auth.php index f2003dfe..697d06a1 100644 --- a/inc/mod/auth.php +++ b/inc/mod/auth.php @@ -69,13 +69,13 @@ function setCookies() { $mod['hash'][0] . // password ':' . $mod['hash'][1], // salt - time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, false, $config['cookies']['httponly']); + time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], $config['cookies']['httponly']); } function destroyCookies() { global $config; // Delete the cookies - setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', null, false, true); + setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], true); } function modLog($action, $_board=null) { diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 03f00ef1..d340dc44 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -150,7 +150,7 @@ function mod_dashboard() { $latest = false; } - setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, false, true); + setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], true); } if ($latest) diff --git a/js/expand-too-long.js b/js/expand-too-long.js index e768aa27..0720fa75 100644 --- a/js/expand-too-long.js +++ b/js/expand-too-long.js @@ -23,7 +23,7 @@ $(function() { url: url, context: document.body, success: function(data) { - var content = $(data).find('#'+url.split('#')[1]).next().next().html(); + var content = $(data).find('#'+url.split('#')[1]).parent().find(".body").html(); body.html(content); } diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html index 6425e0c1..6178d4a9 100644 --- a/templates/themes/basic/index.html +++ b/templates/themes/basic/index.html @@ -3,6 +3,7 @@ <html> <head> <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> + <meta name="viewport" content="width=device-width" /> <title>{{ settings.title }}</title> <link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/> </head> |