hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +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

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

@@ -20,7 +20,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @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
{
/**
*
@@ -36,10 +36,10 @@ class API_OAuth2_Exception_Redirect_Unauthorized extends API_OAuth2_Exception_Re
/**
*
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @return API_OAuth2_Exception_Redirect_Unauthorized
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @return API_OAuth2_Exception_Redirect_TemporaryUnavailable
*/
public function __construct($redirect_uri, $state = null, $error_uri = null)
{

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

@@ -680,7 +680,7 @@ class API_V1_adapter extends API_V1_Abstract
$reasons = $output = null;
$callback = function($element, $visa, $code) use (&$reasons, &$output) {
$callback = function ($element, $visa, $code) use (&$reasons, &$output) {
if (!$visa->isValid()) {
$reasons = array();
@@ -900,9 +900,9 @@ class API_V1_adapter extends API_V1_Abstract
$this->app['EM']->flush();
foreach ($options->getDataboxes() as $databox) {
$colls = array_map(function(\collection $collection) {
$colls = array_map(function (\collection $collection) {
return $collection->get_coll_id();
}, array_filter($options->getCollections(), function(\collection $collection) use ($databox) {
}, array_filter($options->getCollections(), function (\collection $collection) use ($databox) {
return $collection->get_databox()->get_sbas_id() == $databox->get_sbas_id();
}));
@@ -1908,7 +1908,7 @@ class API_V1_adapter extends API_V1_Abstract
$caption = $story->get_caption();
$format = function(caption_record $caption, $dcField) {
$format = function (caption_record $caption, $dcField) {
$field = $caption->get_dc_field($dcField);