From 40f38fc87fe2993dfcc2c2953f0a073096e806e6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 15 Jan 2021 08:32:06 +0300
Subject: pluginhost: load plugin data automatically (also marks load_data
 method as private)

---
 classes/pluginhost.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'classes/pluginhost.php')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 3ff658918..2ce20be86 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -14,6 +14,7 @@ class PluginHost {
 	private $plugin_actions = array();
 	private $owner_uid;
 	private $last_registered;
+	private $data_loaded;
 	private static $instance;
 
 	const API_VERSION = 2;
@@ -268,6 +269,8 @@ class PluginHost {
 				}
 			}
 		}
+
+		$this->load_data();
 	}
 
 	function is_system($plugin) {
@@ -352,8 +355,8 @@ class PluginHost {
 		}
 	}
 
-	function load_data() {
-		if ($this->owner_uid)  {
+	private function load_data() {
+		if (get_schema_version() > 100 && $this->owner_uid && !$this->data_loaded)  {
 			$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = ?");
 			$sth->execute([$this->owner_uid]);
@@ -361,6 +364,8 @@ class PluginHost {
 			while ($line = $sth->fetch()) {
 				$this->storage[$line["name"]] = unserialize($line["content"]);
 			}
+
+			$this->data_loaded = true;
 		}
 	}
 
@@ -411,6 +416,8 @@ class PluginHost {
 	function get($sender, $name, $default_value = false) {
 		$idx = get_class($sender);
 
+		$this->load_data();
+
 		if (isset($this->storage[$idx][$name])) {
 			return $this->storage[$idx][$name];
 		} else {
-- 
cgit v1.2.3-54-g00ecf