diff options
| author | Heiko Adams <[email protected]> | 2013-04-02 13:38:42 +0200 |
|---|---|---|
| committer | Heiko Adams <[email protected]> | 2013-04-02 13:38:42 +0200 |
| commit | 127585a05cba0f9d5d79ed5cf83394f04a7138d4 (patch) | |
| tree | da04bcc463b90efa34c6763bd3fc7399a9dcff90 /include | |
| parent | 58f42816c56a8ea82f1fabe1ba83794005f1c7d6 (diff) | |
| parent | 4b7726f0b44db36ad12c0a0918a9129c8cbb1caa (diff) | |
Merge branch 'master' of https://github.com/HeikoAdams/Tiny-Tiny-RSS
Diffstat (limited to 'include')
| -rw-r--r-- | include/login_form.php | 2 | ||||
| -rw-r--r-- | include/sessions.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/login_form.php b/include/login_form.php index 4fc08261a..7ac7111c8 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -122,7 +122,7 @@ function init() { function fetchProfiles() { try { - var query = "?op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value); + var query = "op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value); if (query) { new Ajax.Request("public.php", { diff --git a/include/sessions.php b/include/sessions.php index dd1ca663d..539b81a06 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -19,6 +19,8 @@ ini_set("session.use_only_cookies", true); ini_set("session.gc_maxlifetime", $session_expire); + global $session_connection; + function session_get_schema_version($link, $nocache = false) { global $schema_version; @@ -34,6 +36,7 @@ function validate_session($link) { if (SINGLE_USER_MODE) return true; + if (!$link) return false; $check_ip = $_SESSION['ip_address']; @@ -92,7 +95,6 @@ function ttrss_open ($s, $n) { - global $session_connection; $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); |