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

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

Browse source
This commit is contained in:
origami11 2017-06-06 10:15:26 +03:00
commit 82ab3c7baf
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Controller/Component.php
View file

@ -318,11 +318,7 @@ class Controller_Component
} }
function addRequireJsPath($name, $path, $shim = null) { function addRequireJsPath($name, $path, $shim = null) {
global $requireJsConfig; Controller_Site::addRequireJsPath($name, $path, $shim);
$requireJsConfig['paths'][$name] = $path;
if ($shim) {
$requireJsConfig['shim'][$name] = $shim;
}
} }
function actionIndex(/*.ComponentRequest.*/ $request) { function actionIndex(/*.ComponentRequest.*/ $request) {