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

Merge branch '4.0'

Browse Source 
Also updated dependencies
This commit is contained in:
Benoît Burnichon
2016-02-28 23:31:16 +01:00
parent 7ee7d1ca74 9999ceda12
commit 5975178749
22 changed files with 2537 additions and 2279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/classes/record/adapter.php
View File

@@ -565,14 +565,14 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
{
$name = strtolower($name);
if (!in_array($name, $this->get_available_subdefs())) {
throw new Exception_Media_SubdefNotFound(sprintf("subdef `%s` not found", $name));
}
if (isset($this->subdefs[$name])) {
return $this->subdefs[$name];
}
if (!in_array($name, $this->get_available_subdefs())) {
throw new Exception_Media_SubdefNotFound(sprintf("subdef `%s` not found", $name));
}
if (!$this->subdefs) {
$this->subdefs = [];
}
@@ -1583,7 +1583,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
}
/**
* @return set_selection
* @return set_selection|record_adapter[]
* @throws Exception
* @throws \Doctrine\DBAL\DBALException
* @deprecated use {@link self::getChildren} instead.
@@ -1593,6 +1593,11 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
return $this->getChildren();
}
/**
* @return set_selection|record_adapter[]
* @throws Exception
* @throws \Doctrine\DBAL\DBALException
*/
public function getChildren()
{
if (!$this->isStory()) {