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

Merge branch '3.7' into 3.8

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
This commit is contained in:
Romain Neutron
2013-09-14 02:02:56 +02:00
parent 34af09ef0b af95d781b2
commit f955163edb
8 changed files with 123 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/patch/370a3.php
View File

@@ -61,7 +61,7 @@ class patch_370a3 implements patchInterface
} catch (NotFoundHttpException $e) {
$client = \API_OAuth2_Application::create($app, null, \API_OAuth2_Application_Navigator::CLIENT_NAME);
$client->set_activated(false);
$client->set_activated(true);
$client->set_grant_password(true);
$client->set_website("http://www.phraseanet.com");
$client->set_client_id(\API_OAuth2_Application_Navigator::CLIENT_ID);