stop caching schema version entirely, fix some session_start() related warnings

2 files changed, 8 insertions, 15 deletions

diff --git a/include/functions.php b/include/functions.php
index 9b5661383..746f8d39e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -305,22 +305,14 @@
 		return $s ? 1 : 0;
 	}
 
-	// Session caching removed due to causing wrong redirects to upgrade
-	// script when get_schema_version() is called on an obsolete session
-	// created on a previous schema version.
-	function get_schema_version($nocache = false) {
-		global $schema_version;
-
+	function get_schema_version() {
 		$pdo = Db::pdo();
 
-		if (!$schema_version && !$nocache) {
-			$row = $pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
-			$version = $row["schema_version"];
-			$schema_version = $version;
-			return $version;
-		} else {
-			return $schema_version;
-		}
+		$row = $pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+		$version = $row["schema_version"];
+		$schema_version = $version;
+
+		return $version;
 	}
 
 	function file_is_locked($filename) {
diff --git a/include/sessions.php b/include/sessions.php
index d4f21d8cd..23815e182 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -152,6 +152,7 @@
 
 	if (!defined('NO_SESSION_AUTOSTART')) {
 		if (isset($_COOKIE[session_name()])) {
-			@session_start();
+			if (session_status() != PHP_SESSION_ACTIVE)
+					session_start();
 		}
 	}