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

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-25 19:02:26 +01:00
parent a910017d08 de5ffe76ae
commit 2d8451c5eb
41 changed files with 610 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Application/Lightbox.php
View File

@@ -74,7 +74,6 @@ return call_user_func(
{
/* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig();
// var_dump($twig->getLoader()->getPaths());
$browser = \Browser::getInstance();
if (!$browser->isMobile())

2
lib/Alchemy/Phrasea/Helper/Record/Edit.php
View File

@@ -566,7 +566,7 @@ class Edit extends RecordHelper
)
);
$record->set_metadatas($metas);
$record->set_metadatas($metas, true);
}
$newstat = $record->get_status();