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

Fixup Profiler bar error and added /h1 in exception handler

Browse Source
This commit is contained in:
Benoît Burnichon
2015-09-25 17:21:58 +02:00
parent 89f705eebe
commit 63a7129a66
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,9 @@ use Silex\Provider\SwiftmailerServiceProvider;
use Silex\Provider\UrlGeneratorServiceProvider;
use Silex\Provider\ValidatorServiceProvider;
use Silex\Provider\ServiceControllerServiceProvider;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Unoconv\UnoconvServiceProvider;
use XPDF\PdfToText;
use XPDF\XPDFServiceProvider;
@@ -548,7 +550,7 @@ class Application extends SilexApplication
public function setupTwig()
{
$this['twig'] = $this->share(
$this->extend('twig', function (\Twig_Environment $twig, $app) {
$this->extend('twig', function (\Twig_Environment $twig, Application $app) {
$paths = require $app['plugins.directory'] . '/twig-paths.php';
if ($app['browser']->isTablet() || $app['browser']->isMobile()) {
@@ -578,6 +580,25 @@ class Application extends SilexApplication
$twig->addExtension(new \Twig_Extension_Escaper());
if ($app['debug']) {
$twig->addExtension(new \Twig_Extension_Debug());
// This render function appeared with symfony 2.4+
$twig->addFunction(new \Twig_SimpleFunction('render', function ($uri, array $options = []) use ($app) {
/** @var Request $request */
$request = $app['request'];
$subRequest = Request::create(
$uri,
'GET',
array(),
$request->cookies->all(),
$options,
$request->server->all()
);
$response = $app->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
return $response->getContent();
}));
}
// add filter trans

2
lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php
View File

@@ -50,7 +50,7 @@ class PhraseaExceptionHandler extends SymfonyExceptionHandler
$content = '<div id="sf-resetcontent" class="sf-reset">'
. '<h1><span>' . $title . '</span></h1>'
. substr($content, $start);
. substr($content, $start + 5);
return $content;
}