From 73112f5bf0b648380365bfa103a1b71ce958ad10 Mon Sep 17 00:00:00 2001
From: "origami11@yandex.ru" <phedor@edu.yar.ru>
Date: Fri, 9 Dec 2022 17:39:23 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B0=20=D0=BE=D0=B1=D1=8C=D0=B5=D0=BA=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Controller/Action.php | 2 +-
 src/Database.php          | 2 +-
 src/Model/Factory.php     | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Controller/Action.php b/src/Controller/Action.php
index 241b3df..4309caf 100644
--- a/src/Controller/Action.php
+++ b/src/Controller/Action.php
@@ -153,7 +153,7 @@ class Action
     public function getModel($name)
     {
         if (!$this->factory) {
-            $this->factory = new Factory($this->db, $this->config);
+            $this->factory = new Factory($this->db, $this->config, $this->user);
         }
         return $this->factory->getModel($name);
     }
diff --git a/src/Database.php b/src/Database.php
index 3cb15b6..b2ac6ca 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -30,7 +30,7 @@ class Database/*<Database_PDOStatement>*/ extends PDO
         $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('ctiso\\Database\\PDOStatement', array()));
     }
     
-    function prepare($sql, $args = []) {
+    function prepare($sql, $args = []) {        
         $result/*: PDOStatement*/ = parent::prepare($sql, $args);
         return $result;
     }
diff --git a/src/Model/Factory.php b/src/Model/Factory.php
index 031ce43..39d30ca 100644
--- a/src/Model/Factory.php
+++ b/src/Model/Factory.php
@@ -2,17 +2,19 @@
 
 namespace ctiso\Model;
 use ctiso\Registry,
-    ctiso\Database;
+    ctiso\Database,
+    ctiso\Role\User;
 
 class Factory
 {
     public $db;
     public $config;
 
-    public function __construct (Database $db, Registry $config = null)
+    public function __construct (Database $db, Registry $config = null, User $user)
     {
         $this->db = $db;
         $this->config = $config;
+        $this->user = $user;
     }
      
     /**
@@ -27,6 +29,7 @@ class Factory
         $model->db = $this->db;
         $model->factory = $this;
         $model->config = $this->config;
+        $model->user = $this->user;
         $model->setUp();
         //
         return $model;