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

Merge branch 'dev' of http://gitlab.edu.yar.ru/composer/PHP_library

Browse source
This commit is contained in:
Anatoly 2017-11-30 10:59:54 +03:00
commit b45c7e9a58
4 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Controller/Component.php
View file

@ -260,10 +260,16 @@ class Controller_Component
$component->parameter = $params;
$component->template = $params->get('template', false);
global $componentsConfig;
$editor = $component->getEditUrl();
if ($editor) {
$componentsConfig[] = $editor;
if(class_exists("Controller_Site")){ //Если мы в CMS2
$instance = Controller_Site::getInstance();
$instance->componentsConfig[] = $editor;
}else{
global $componentsConfig;
$componentsConfig[] = $editor;
}
}
return $component;
@ -308,6 +314,10 @@ class Controller_Component
return '?' . http_build_query($arr);
}
/**
* @deprecated В CMS2 перенесено в контроллер сайта!
*/
function addRequireJsPath($name, $path, $shim = null) {
Controller_Site::addRequireJsPath($name, $path, $shim);
}