diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-10 10:53:23 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-10 10:53:23 -0700 |
| commit | 0633bfb2af90e2c2c73443b7b9edc84f916990bb (patch) | |
| tree | 3dae081f7f04860f6c7415773391d98f65b6fd82 /modules/organize/views | |
| parent | 7925d5e292c99520003a395035bfd20dc449ad6e (diff) | |
| parent | 752c85711659eb7f83e6556665175266db8f24f5 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
Diffstat (limited to 'modules/organize/views')
| -rw-r--r-- | modules/organize/views/organize_tree.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php index c0c23f94..e5d91c04 100644 --- a/modules/organize/views/organize_tree.html.php +++ b/modules/organize/views/organize_tree.html.php @@ -9,7 +9,7 @@ </span> <ul> <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?> - <? if ($selected && $child->is_descendant($selected)): ?> + <? if ($selected && $child->contains($selected)): ?> <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?> <? else: ?> <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>" |