diff --git a/bb-di.php b/bb-di.php index 1ab3b20ce..5efc81386 100644 --- a/bb-di.php +++ b/bb-di.php @@ -135,7 +135,7 @@ $di['request'] = function () use ($di) { }; $di['cache'] = function () use ($di) { return new FileCache();}; $di['auth'] = function () use ($di) { return new Box_Authorization($di);}; -$di['twig'] = function () use ($di) { +$di['twig'] = $di->factory(function () use ($di) { $config = $di['config']; $options = $config['twig']; @@ -149,7 +149,7 @@ $di['twig'] = function () use ($di) { $twig->addExtension(new \Twig\Extension\StringLoaderExtension()); $twig->addExtension(new Twig\Extension\DebugExtension()); $twig->addExtension(new Twig\Extensions\I18nExtension()); - $twig->addExtension($box_extensions); + $twig->addExtension($box_extensions); $twig->getExtension(Twig\Extension\CoreExtension::class)->setDateFormat($config['locale_date_format']); $twig->getExtension(Twig\Extension\CoreExtension::class)->setTimezone($config['timezone']); @@ -163,7 +163,7 @@ $di['twig'] = function () use ($di) { $twig->addGlobal('guest', $di['api_guest']); return $twig; -}; +}); $di['is_client_logged'] = function() use($di) { if(!$di['auth']->isClientLoggedIn()) { @@ -344,4 +344,4 @@ $di['translate'] = $di->protect(function($textDomain = '') use ($di) { $di['array_get'] = $di->protect(function (array $array, $key, $default = null) use ($di) { return array_key_exists($key, $array) ? $array[$key] : $default; }); -return $di; \ No newline at end of file +return $di; diff --git a/bb-library/Box/Log.php b/bb-library/Box/Log.php index c5729a8fb..b15dc6bc4 100644 --- a/bb-library/Box/Log.php +++ b/bb-library/Box/Log.php @@ -118,9 +118,11 @@ class Box_Log $event['info'] = $info; } } - - //do not log debug level messages if debug is OFF - if($this->_min_priority && $priority > self::INFO) { + + +//if($this->di('config')('debug') === FALSE && $event('priority') > self::INFO) { + //do not log debug level messages if debug is OFF + if($this->_min_priority && $priority > self::INFO) { return ; } @@ -162,4 +164,4 @@ class Box_Log $this->_min_priority = $priority; return $this; } -} \ No newline at end of file +} diff --git a/bb-library/Server/Manager/Plesk.php b/bb-library/Server/Manager/Plesk.php index 28e0cabf3..ac2f50a46 100644 --- a/bb-library/Server/Manager/Plesk.php +++ b/bb-library/Server/Manager/Plesk.php @@ -589,8 +589,7 @@ class Server_Manager_Plesk extends Server_Manager 'Content-Type: text/xml' ); - $xml = $this->_arrayToXml($params, new SimpleXMLElement('')) - ->asXML(); + $xml = $this->_arrayToXml($params, new SimpleXMLElement('')); error_log($xml); $ch = curl_init (); curl_setopt ($ch, CURLOPT_SSL_VERIFYHOST, 0); @@ -962,4 +961,4 @@ class Server_Manager_Plesk extends Server_Manager return false; } } -} \ No newline at end of file +}