Fix merge

This commit is contained in:
Romain Neutron
2013-09-17 16:15:44 +02:00
parent 537c41fc09
commit 391d84ca56

View File

@@ -394,7 +394,7 @@ class API_V1_adapter extends API_V1_Abstract
'active' => $app['phraseanet.registry']->get('GV_client_navigator'),
),
'office-plugin' => array(
'active' => $registry->get('GV_client_navigator'),
'active' => $app['phraseanet.registry']->get('GV_client_navigator'),
),
'homepage' => array(
'viewType' => $app['phraseanet.registry']->get('GV_home_publi'),