diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-24 16:57:24 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-24 16:57:24 +0400 |
| commit | 3472c4c5696cfa868b16d81c937605258acd2125 (patch) | |
| tree | 35b841eeffd8a7e54979404f1ec2909c1f1409df /include | |
| parent | 84ceb6bd2eb0257a1cc863ff40120a694fa51b79 (diff) | |
use static version for session checking, show latest changeset for git version instead of head date
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | include/sessions.php | 2 | ||||
| -rw-r--r-- | include/version.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index a41d3a950..39021e9d0 100644 --- a/include/functions.php +++ b/include/functions.php @@ -659,7 +659,7 @@ @session_start(); $_SESSION["uid"] = $user_id; - $_SESSION["version"] = VERSION; + $_SESSION["version"] = VERSION_STATIC; $result = db_query("SELECT login,access_level,pwd_hash FROM ttrss_users WHERE id = '$user_id'"); diff --git a/include/sessions.php b/include/sessions.php index c4876489f..423ef0eda 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -39,7 +39,7 @@ function validate_session() { if (SINGLE_USER_MODE) return true; - if (VERSION != $_SESSION["version"]) return false; + if (VERSION_STATIC != $_SESSION["version"]) return false; $check_ip = $_SESSION['ip_address']; diff --git a/include/version.php b/include/version.php index 4d088a2bb..0e583f9ec 100644 --- a/include/version.php +++ b/include/version.php @@ -7,7 +7,7 @@ if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) { - $suffix = date("Ymd", filemtime("$root_dir/.git/ORIG_HEAD")); + $suffix = substr(trim(file_get_contents("$root_dir/.git/ORIG_HEAD")), 0, 7); return VERSION_STATIC . ".$suffix"; } else { |