From db7b5c7d259a0988b682bf9fa29a5443f7d3da1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D1=91=D0=B4=D0=BE=D1=80=20=D0=9F=D0=BE=D0=B4=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BD=D0=BE=D0=B2?= <phedor@corp.edu.yar.ru>
Date: Fri, 9 Feb 2018 12:02:35 +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=82=D0=B8=D0=BF=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Controller/Component.php | 2 +-
 src/Functions.php            | 2 +-
 src/tales.php                | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Controller/Component.php b/src/Controller/Component.php
index c70c718..4a75ed4 100644
--- a/src/Controller/Component.php
+++ b/src/Controller/Component.php
@@ -189,7 +189,7 @@ class Controller_Component
         $view->component_title = $settings['title'];
     }
 
-    static function loadComponent($expression, Database $db, /*.Settings.*/ $registry)
+    static function loadComponent($expression, Database $db, /*.Registry.*/ $registry)
     {
     
         $expression = htmlspecialchars_decode($expression);
diff --git a/src/Functions.php b/src/Functions.php
index 785e893..3f888e7 100644
--- a/src/Functions.php
+++ b/src/Functions.php
@@ -358,7 +358,7 @@ class Functions {
      * @param $key Имя ключа по значению которого будет идти сравнение
      * @return Отсортированный массив
      */
-    static function sortOn($array, $key, $fn = '__cmp') {
+    static function sortOn($array, $key, $fn = 'Functions::__cmp') {
         usort ($array, Functions::rcurry($fn, $key));
         //usort ($array, create_function ('$x,$y', 'return __cmp ($x, $y, "'.$key.'");'));
         return $array;
diff --git a/src/tales.php b/src/tales.php
index ac34ef8..0d727e8 100644
--- a/src/tales.php
+++ b/src/tales.php
@@ -45,7 +45,8 @@ function phptal_time ($e)
  * Функция подключения компонента
  */
 function phptal_component ($expression) {
-    $begin = microtime(true);
+    $begin = floatval(microtime(true));
+    /*.Controller_Component.*/$component = null;
 
     if(class_exists("Controller_Site")){ //Если мы в CMS2
         $component = Controller_Site::loadComponent($expression);