libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'noglob' of http://gitlab.edu.yar.ru/composer/PHP_Library into noglob

Browse source
This commit is contained in:
CORP\phedor 2018-04-26 12:31:57 +03:00
commit 04662a94df
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Controller/Component.php
View file

@ -12,7 +12,7 @@ use ctiso\HttpRequest,
ctiso\Database\PDOStatement,
ctiso\Collection,
ctiso\Registry,
App\Controller\Site,
ctiso\Controller\SiteInterface,
PHPTAL,
PHPTAL_PreFilter_Normalize;
@ -207,7 +207,7 @@ class Component
$view->component_title = $settings['title'];
}
static function loadComponent($expression, /*.Site.*/ $site)
static function loadComponent($expression, /*.SiteInterface.*/ $site)
{
$expression = htmlspecialchars_decode($expression);
@ -249,7 +249,7 @@ class Component
}
}
$db = $site->db;
$db = $site->getDatabase();
$component->db = $db;
$component->config = $site->config;