stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-11 17:53:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source 
Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
This commit is contained in:
Tim Almdal
2009-12-26 11:24:50 -08:00
parent 1cd6a615bb 32d25dafd5
commit 3060a6f662
307 changed files with 11046 additions and 12395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/organize/views/organize_tree.html.php
View File

@@ -8,7 +8,7 @@
<?= html::clean($album->title) ?>
</span>
<ul>
<? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
<? foreach ($album->children(null, null, array(array("type", "=", "album"))) as $child): ?>
<? if ($selected && $child->contains($selected)): ?>
<?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
<? else: ?>