hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

add environnement to bootstrap::execute

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-03 14:45:12 +01:00
parent d95b6a48e1
commit 45f0137a20
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/bootstrap.class.php
View File

@@ -8,6 +8,9 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
require_once __DIR__ . '/../Alchemy/Phrasea/Core.php';
use Alchemy\Phrasea\Core;
/**
*
@@ -15,9 +18,6 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
require_once __DIR__ . '/../Alchemy/Phrasea/Core.php';
class bootstrap
{
@@ -25,21 +25,22 @@ class bootstrap
public static function set_php_configuration()
{
return Alchemy\Phrasea\Core::initPHPConf();
return Core::initPHPConf();
}
/**
*
* @param $env
* @return Alchemy\Phrasea\Core
*/
public static function execute($env = 'main')
public static function execute($env = null)
{
if(static::$core)
if (static::$core)
{
return static::$core;
}
static::$core = new Alchemy\Phrasea\Core($env);
static::$core = new Core($env);
return static::$core;
}
@@ -55,7 +56,7 @@ class bootstrap
public static function register_autoloads()
{
return Alchemy\Phrasea\Core::initAutoloads();
return Core::initAutoloads();
}
}