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

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2013-09-24 12:43:00 +02:00
parent 47af41e7cb fe4a99cf96
commit d00b39fec8
8 changed files with 404 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/classes/API/V1/adapter.php
View File

@@ -372,7 +372,6 @@ class API_V1_adapter extends API_V1_Abstract
'webServices' => array(
'googleApi' => $app['phraseanet.registry']->get('GV_google_api'),
'googleAnalyticsId' => $app['phraseanet.registry']->get('GV_googleAnalytics'),
'googleChromeFrameDisclaimer' => $app['phraseanet.registry']->get('GV_display_gcf'),
'i18nWebService' => $app['phraseanet.registry']->get('GV_i18n_service'),
'recaptacha' => array(
'active' => $app['phraseanet.registry']->get('GV_captchas'),