From dd08a235c0abfd681390cec191cd16056ecda797 Mon Sep 17 00:00:00 2001
From: origami11 <origami11@yandex.ru>
Date: Fri, 23 Jun 2017 15:51:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D1=89=D0=B8?=
 =?UTF-8?q?=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B0=D0=B9=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Controller/Installer.php | 14 ++++++++------
 src/Database/JsonInstall.php |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Controller/Installer.php b/src/Controller/Installer.php
index dcc4562..2c17f9a 100644
--- a/src/Controller/Installer.php
+++ b/src/Controller/Installer.php
@@ -69,6 +69,7 @@ class Controller_Installer
     {
         $result = array();
         $setup = $this->getSetupFile($name);
+
         if (file_exists($setup) && ($this->isChanged($name) || $force)) {
             $registry = $this->_registry;
             $settings = new Settings($setup);
@@ -91,20 +92,21 @@ class Controller_Installer
                         $result[]=$res;
                     }
                 }
-            }   
 
-            // Обновление версии меню
-            $registry->removeKey($name);
-            $registry->writeKey(array($name), $settings->get('settings'));
-            $registry->writeKey(array($name), 
+                // Обновление версии меню
+                $registry->removeKey($name);
+                $registry->writeKey(array($name), $settings->get('settings'));
+                $registry->writeKey(array($name), 
                                       array('version' => $version_new, 
                                             'time' => filemtime($setup)));
+            }   
+
             $registry->write();
         }
         return $result;
     }
 
-    function install($dbinit_path,$dbfill_path=null){
+    function install($dbinit_path, $dbfill_path = null) {
         $json_installer = new Database_JsonInstall($this->db_manager);
         $json_installer->install($dbinit_path,$dbfill_path);
     }
diff --git a/src/Database/JsonInstall.php b/src/Database/JsonInstall.php
index ee62cf3..54a7d6f 100644
--- a/src/Database/JsonInstall.php
+++ b/src/Database/JsonInstall.php
@@ -14,11 +14,11 @@ class Database_JsonInstall {
 		if (is_string($dbinit_file)) {
 			$initActions = json_decode($dbinit_file, true);
 			if (!$initActions) {
-				echo "Invalid dbinit.json ".$dbinit_file;
+				echo "Invalid ".$dbinit_path;
 				return 0;
 			}
 		} else {
-			echo "No dbinit.json";
+			echo "No ".$dbinit_path;
 			return 0;
 		}