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

This is a combination of 33 commits.

Browse Source 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
This commit is contained in:
Benoît Burnichon
2016-04-19 19:21:04 +02:00
parent 01b06c5144
commit 1e18b3e69f
179 changed files with 5652 additions and 3030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/set/abstract.php
View File

@@ -121,7 +121,7 @@ abstract class set_abstract implements IteratorAggregate
*/
public function add_element(\record_adapter $record)
{
$this->elements[$record->get_serialize_key()] = $record;
$this->elements[$record->getId()] = $record;
return $this;
}
@@ -132,7 +132,7 @@ abstract class set_abstract implements IteratorAggregate
*/
public function remove_element(\record_adapter $record)
{
$key = $record->get_serialize_key();
$key = $record->getId();
if (isset($this->elements[$key]))
unset($this->elements[$key]);
@@ -146,7 +146,7 @@ abstract class set_abstract implements IteratorAggregate
{
$basrec = [];
foreach ($this->elements as $record) {
$basrec[] = $record->get_serialize_key();
$basrec[] = $record->getId();
}
return implode(';', $basrec);