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/gallery/views | |
| parent | 7925d5e292c99520003a395035bfd20dc449ad6e (diff) | |
| parent | 752c85711659eb7f83e6556665175266db8f24f5 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/move_tree.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php index 623f80ee..e629e1bb 100644 --- a/modules/gallery/views/move_tree.html.php +++ b/modules/gallery/views/move_tree.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <?= $parent->thumb_img(array(), 25); ?> -<? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?> +<? if (!access::can("edit", $parent) || $source->contains($parent)): ?> <a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= html::clean($parent->title) ?> <?= t("(locked)") ?> </a> <? else: ?> <a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= html::clean($parent->title) ?></a> @@ -9,7 +9,7 @@ <? foreach ($children as $child): ?> <li id="node_<?= $child->id ?>" class="node"> <?= $child->thumb_img(array(), 25); ?> - <? if (!access::can("edit", $child) || $source->is_descendant($child)): ?> + <? if (!access::can("edit", $child) || $source->contains($child)): ?> <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= html::clean($child->title) ?> <?= t("(locked)") ?></a> <? else: ?> <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= html::clean($child->title) ?> </a> |