diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-04 13:21:11 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-04 13:21:11 +0400 |
| commit | e6cdbaec9fcc6a5245edbc3af358e64839646ff6 (patch) | |
| tree | de68b42ab244e8098f8093331a1d5ccef638110c /include | |
| parent | 5929a0c1e4a544718cd942afe27f9c832f87a2c0 (diff) | |
| parent | 810205625b8afb7e08b2829723426f021e0a5c1b (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 4 | ||||
| -rw-r--r-- | include/sessions.php | 3 | ||||
| -rw-r--r-- | include/version.php | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index f4f6ed209..71fd16542 100644 --- a/include/functions.php +++ b/include/functions.php @@ -318,7 +318,7 @@ global $fetch_last_error; global $fetch_last_error_code; - if (!defined('NO_CURL') && !function_exists('curl_init') && !ini_get("open_basedir")) { + if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) { if (ini_get("safe_mode")) { $ch = curl_init(geturl($url)); @@ -630,6 +630,7 @@ @session_start(); $_SESSION["uid"] = $user_id; + $_SESSION["version"] = VERSION; $result = db_query($link, "SELECT login,access_level,pwd_hash FROM ttrss_users WHERE id = '$user_id'"); @@ -2412,6 +2413,7 @@ $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; } else if ($feed == -4) { // all articles virtual feed + $allow_archived = true; $query_strategy_part = "true"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; } else if ($feed <= LABEL_BASE_INDEX) { // labels diff --git a/include/sessions.php b/include/sessions.php index 15178915a..0edda4ec7 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -5,6 +5,7 @@ require_once "db.php"; require_once "lib/accept-to-gettext.php"; require_once "lib/gettext/gettext.inc"; + require_once "version.php"; $session_expire = max(SESSION_COOKIE_LIFETIME, 86400); $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; @@ -38,6 +39,8 @@ if (SINGLE_USER_MODE) return true; if (!$link) return false; + if (VERSION != $_SESSION["version"]) return false; + $check_ip = $_SESSION['ip_address']; switch (SESSION_CHECK_ADDRESS) { diff --git a/include/version.php b/include/version.php index a937ea527..61851dffb 100644 --- a/include/version.php +++ b/include/version.php @@ -1,3 +1,3 @@ <?php - define('VERSION', "1.7.6"); + define('VERSION', "1.7.8"); ?> |