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

Fix issue of plugins autoload at bootstrap.

Browse Source
This commit is contained in:
Benoît Burnichon
2015-04-08 11:32:18 +02:00
parent 2eac08a0cc
commit 801eb39447
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Alchemy/Phrasea/Application.php
View File

@@ -330,7 +330,9 @@ class Application extends SilexApplication
public function loadPlugins() public function loadPlugins()
{ {
call_user_func(function ($app) { call_user_func(function ($app) {
if (file_exists($app['plugin.path'] . '/services.php')) {
require $app['plugin.path'] . '/services.php'; require $app['plugin.path'] . '/services.php';
}
}, $this); }, $this);
} }
@@ -385,7 +387,10 @@ class Application extends SilexApplication
$this->extend('twig', function (\Twig_Environment $twig, $app) { $this->extend('twig', function (\Twig_Environment $twig, $app) {
$twig->setCache($app['cache.path'].'/twig'); $twig->setCache($app['cache.path'].'/twig');
$paths = [];
if (file_exists($app['plugin.path'] . '/twig-paths.php')) {
$paths = require $app['plugin.path'] . '/twig-paths.php'; $paths = require $app['plugin.path'] . '/twig-paths.php';
}
if ($app['browser']->isTablet() || $app['browser']->isMobile()) { if ($app['browser']->isTablet() || $app['browser']->isMobile()) {
$paths[] = $app['root.path'] . '/config/templates/mobile'; $paths[] = $app['root.path'] . '/config/templates/mobile';

5
lib/autoload.php
View File

@@ -1,3 +1,6 @@
<?php <?php
return require __DIR__ . '/../plugins/autoload.php'; require __DIR__ . '/../vendor/autoload.php';
if (file_exists(__DIR__ . '/../plugins/autoload.php')) {
require __DIR__ . '/../plugins/autoload.php';
}