update-self: fix wrong work directory, better work directory checking

1 files changed, 7 insertions, 1 deletions

diff --git a/include/update_self.php b/include/update_self.php
index e33fe4bfa..6e57213b9 100644
--- a/include/update_self.php
+++ b/include/update_self.php
@@ -1,6 +1,7 @@
 <?php
 	function update_self($link, $force = false) {
-		$work_dir = dirname(__FILE__);
+		// __FILE__ is in include/ so we need to go one level up
+		$work_dir = dirname(dirname(__FILE__));
 		$parent_dir = dirname($work_dir);
 
 		if (!is_writable($work_dir) && !is_writable("$parent_dir")) {
@@ -8,6 +9,11 @@
 			exit;
 		}
 
+		if (!file_exists("$work_dir/config.php") || !file_exists("$work_dir/include/sanity_check.php")) {
+			_debug("Work directory $work_dir doesn't look like tt-rss installation.");
+			exit;
+		}
+
 		if (!is_writable(sys_get_temp_dir())) {
 			_debug("System temporary directory should be writable as current user.");
 			exit;