kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Merge 4.5

Browse Source 
Conflicts:
	js/expand-too-long.js
This commit is contained in:
czaks 2014-06-10 17:51:03 +02:00
commit c2cbbe7e22
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/mod/auth.php
View File

@ -69,13 +69,13 @@ function setCookies() {
$mod['hash'][0] . // password $mod['hash'][0] . // password
':' . ':' .
$mod['hash'][1], // salt $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() { function destroyCookies() {
global $config; global $config;
// Delete the cookies // 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) { function modLog($action, $_board=null) {

2
inc/mod/pages.php
View File

@ -150,7 +150,7 @@ function mod_dashboard() {
$latest = false; $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) if ($latest)

2
js/expand-too-long.js
View File

@ -23,7 +23,7 @@ $(function() {
url: url, url: url,
context: document.body, context: document.body,
success: function(data) { 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); body.html(content);
} }

1
templates/themes/basic/index.html
View File

@ -3,6 +3,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width" />
<title>{{ settings.title }}</title> <title>{{ settings.title }}</title>
<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/> <link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
</head> </head>