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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
This commit is contained in:
Romain Neutron
2013-10-31 14:01:44 +01:00
parent 38264a0ae7 7d93d958b3
commit ea7523f1db
98 changed files with 265 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php
View File

@@ -20,7 +20,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com * @link www.phraseanet.com
*/ */
class API_OAuth2_Exception_Redirect_Unauthorized extends API_OAuth2_Exception_Redirect class API_OAuth2_Exception_Redirect_TemporaryUnavailable extends API_OAuth2_Exception_Redirect
{ {
/** /**
* *
@@ -39,7 +39,7 @@ class API_OAuth2_Exception_Redirect_Unauthorized extends API_OAuth2_Exception_Re
* @param string $redirect_uri * @param string $redirect_uri
* @param string $state * @param string $state
* @param string $error_uri * @param string $error_uri
* @return API_OAuth2_Exception_Redirect_Unauthorized * @return API_OAuth2_Exception_Redirect_TemporaryUnavailable
*/ */
public function __construct($redirect_uri, $state = null, $error_uri = null) public function __construct($redirect_uri, $state = null, $error_uri = null)
{ {

2
lib/classes/Bridge/Api/Dailymotion.php
View File

@@ -370,7 +370,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
); );
if ( ! $this->is_valid_object_id($object_id)) if ( ! $this->is_valid_object_id($object_id))
throw new Bridge_Exception_InvalidObjectId($object_id); throw new Bridge_Exception_ActionInvalidObjectId($object_id);
switch ($object) { switch ($object) {
case self::ELEMENT_TYPE_VIDEO : case self::ELEMENT_TYPE_VIDEO :

2
lib/classes/Bridge/Api/Youtube.php
View File

@@ -304,7 +304,7 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
} }
if ( ! $this->is_valid_object_id($object_id)) if ( ! $this->is_valid_object_id($object_id))
throw new Bridge_Exception_InvalidObjectId($object_id); throw new Bridge_Exception_ActionInvalidObjectId($object_id);
switch ($object) { switch ($object) {
case "video" : case "video" :

2
lib/classes/Bridge/Exception/ActionInvalidObjectId.php
View File

@@ -15,7 +15,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com * @link www.phraseanet.com
*/ */
class Bridge_Exception_InvalidObjectId extends Bridge_Exception class Bridge_Exception_ActionInvalidObjectId extends Bridge_Exception
{ {
} }

1
lib/classes/patch/3819.php
View File

@@ -10,7 +10,6 @@
*/ */
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Symfony\Component\Process\ExecutableFinder;
class patch_3819 implements patchInterface class patch_3819 implements patchInterface
{ {

1
lib/classes/patch/3820.php
View File

@@ -10,7 +10,6 @@
*/ */
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Symfony\Component\Process\ExecutableFinder;
class patch_3820 implements patchInterface class patch_3820 implements patchInterface
{ {