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:
Фёдор Подлеснов 2017-11-24 15:33:07 +03:00
commit e6686e3bd3
7 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Controller/Action.php
View file

@ -211,7 +211,8 @@ class Controller_Action
public function nUrl($name, array $param = array())
{
/*.Filter_ActionAccess.*/$access = $this->access;
if ($access != null || $access->checkAction($name)) {
if ($access == null || $access->checkAction($name)) {
return lcurry(array($this, 'postUrl'), $name, $param);
}
return null;

12
src/Controller/Installer.php
View file

@ -70,6 +70,7 @@ class Controller_Installer
{
$result = array();
$setup = $this->getSetupFile($name);
if (file_exists($setup) && ($this->isChanged($name) || $force)) {
$registry = $this->_registry;
$settings = new Settings($setup);
@ -93,14 +94,15 @@ class Controller_Installer
$result[]=$res;
}
}
}
// Обновление версии меню
$registry->removeKey($name);
$registry->writeKey(array($name), $settings->get('settings'));
$registry->writeKey(array($name),
// Обновление версии меню
$registry->removeKey($name);
$registry->writeKey(array($name), $settings->get('settings'));
$registry->writeKey(array($name),
array('version' => $version_new,
'time' => filemtime($setup)));
}
$registry->write();
}
return $result;