mikuli.cz

commit c5a1f4e5ab7184eadad8395fd47ca28ae91a449f
parent a5baeebd841a7aad9cebba04363696c92b156ea6
Author: markseu <mark2011@mayberg.se>
Date:   Sun,  2 Jul 2017 13:58:44 +0200

System update (installation)

Diffstat:
R
system/plugins/update-blog.zip.installation -> system/plugins/update-blog.installation
 | 
0

R
system/plugins/update-wiki.zip.installation -> system/plugins/update-wiki.installation
 | 
0

M
system/plugins/update.php
 | 
6
++----

3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/system/plugins/update-blog.zip.installation b/system/plugins/update-blog.installation
Binary files differ.
diff --git a/system/plugins/update-wiki.zip.installation b/system/plugins/update-wiki.installation
Binary files differ.
diff --git a/system/plugins/update.php b/system/plugins/update.php
@@ -328,7 +328,6 @@ class YellowUpdate
 				$this->yellow->page->error($statusCode, "Can't delete file '$entry'!");
 			}
 		}
-		$statusCode = max($statusCode, $this->updateSoftwareNotification("YellowUpdate"));
 		return $statusCode;
 	}
 
@@ -492,9 +491,8 @@ class YellowUpdate
 	{
 		$statusCode = 200;
 		$startupUpdate = $this->yellow->config->get("startupUpdate");
-		if($startupUpdate=="none") $startupUpdate = "";
-		if(!empty($startupUpdate)) $startupUpdate .= ",";
-		$startupUpdate .= $software;
+		if($startupUpdate=="none") $startupUpdate = "YellowUpdate";
+		if($software!="YellowUpdate") $startupUpdate .= ",$software";
 		$fileNameConfig = $this->yellow->config->get("configDir").$this->yellow->config->get("configFile");
 		if(!$this->yellow->config->update($fileNameConfig, array("startupUpdate" => $startupUpdate)))
 		{