This commit is contained in:
Romain Neutron
2013-05-29 21:21:02 +02:00
parent e36e7ad085
commit 38f38290c8
35 changed files with 1577 additions and 1592 deletions

View File

@@ -1607,7 +1607,7 @@ class ACL implements cache_cacheableInterface
$collections = array();
foreach($rs as $row) {
foreach ($rs as $row) {
$collections[] = \collection::get_from_base_id($this->app, $row['base_id']);
}

View File

@@ -25,7 +25,7 @@ class API_V1_Timer implements ServiceProviderInterface
$callback = function (Event $event) use ($app) {
$name = $event->getName();
$n = 1;
while(isset($app['api.timers']->{$name})) {
while (isset($app['api.timers']->{$name})) {
$n++;
$name = $event->getName() . '#' . $n;
}
@@ -50,4 +50,4 @@ class API_V1_Timer implements ServiceProviderInterface
public function boot(Application $app)
{
}
}
}

View File

@@ -373,7 +373,7 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
*/
public function get_publisher()
{
if ( ! $this->publisher instanceof Feed_Publisher_Adapter) {
if (! $this->publisher instanceof Feed_Publisher_Adapter) {
try {
$this->publisher = new Feed_Publisher_Adapter($this->app, $this->publisher_id);
} catch (\Exception_Feed_PublisherNotFound $e) {

View File

@@ -87,12 +87,12 @@ class caption_record implements caption_interface, cache_cacheableInterface
return $dumper->dump($this->toArray($includeBusinessFields), 3);
}
protected function serializeJSON($includeBusinessFields)
{
return \p4string::jsonencode($this->toArray($includeBusinessFields));
}
protected function toArray($includeBusinessFields)
{
$buffer = array();
@@ -112,6 +112,7 @@ class caption_record implements caption_interface, cache_cacheableInterface
$buffer[$field->get_name()] = ctype_digit($val) ? (int) $val : $val;
}
}
return array('record' => array('description' => $buffer));
}

View File

@@ -147,4 +147,3 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
return count($this->elements);
}
}

View File

@@ -872,9 +872,9 @@ class databox_field implements cache_cacheableInterface
/**
*
* @param \Alchemy\Phrasea\Application $app
* @param databox $databox
* @param type $name
* @param type $multi
* @param databox $databox
* @param type $name
* @param type $multi
*
* @return databox_field
*

View File

@@ -61,4 +61,3 @@ class patch_379 implements patchInterface
return true;
}
}

View File

@@ -79,4 +79,4 @@ class patch_3805 implements patchInterface
$app['EM']->flush();
$app['EM']->clear();
}
}
}

View File

@@ -74,4 +74,4 @@ class patch_3806 implements patchInterface
$app['phraseanet.configuration']->setConfigurations($confs);
}
}
}

View File

@@ -114,7 +114,6 @@ class patch_380a3 implements patchInterface
$stmt->closeCursor();
unset($stmt);
$sql = "CALL explode_log_table(',')";
$stmt = $conn->prepare($sql);
$stmt->execute();
@@ -126,4 +125,4 @@ class patch_380a3 implements patchInterface
return true;
}
}
}

View File

@@ -10,8 +10,6 @@
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
use Alchemy\Phrasea\Exception\RuntimeException;
class phrasea
{

View File

@@ -233,8 +233,8 @@ class random
/**
* Get the validation token for one user and one validation basket
*
* @param integer $userId
* @param integer $basketId
* @param integer $userId
* @param integer $basketId
*
* @return string The token
*

File diff suppressed because it is too large Load Diff