diff options
| author | root <root@sleepydogs.net> | 2009-09-13 09:01:55 -0700 |
|---|---|---|
| committer | root <root@sleepydogs.net> | 2009-09-13 09:01:55 -0700 |
| commit | c62d1f440f077ba806b7ff0c6b90ef89c79b2fd3 (patch) | |
| tree | b64f05e2a7bd8db7200e3c407904e255826b4cf2 /modules/gallery/views/move_tree.html.php | |
| parent | b96ac1eb81b7ccd5bd050ffab0ca9ce1feec8f4f (diff) | |
| parent | caa2002d7777e0ceb884d4c628650804620ca2b6 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views/move_tree.html.php')
| -rw-r--r-- | modules/gallery/views/move_tree.html.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php index 5f70cf67..e629e1bb 100644 --- a/modules/gallery/views/move_tree.html.php +++ b/modules/gallery/views/move_tree.html.php @@ -1,18 +1,18 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <?= $parent->thumb_img(array(), 25); ?> -<? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?> -<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= p::clean($parent->title) ?> <?= t("(locked)") ?> </a> +<? 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)"> <?= p::clean($parent->title) ?></a> +<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= html::clean($parent->title) ?></a> <? endif ?> <ul id="tree_<?= $parent->id ?>"> <? 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)): ?> - <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= p::clean($child->title) ?> <?= t("(locked)") ?></a> + <? 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)"> <?= p::clean($child->title) ?> </a> + <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= html::clean($child->title) ?> </a> <? endif ?> </li> <? endforeach ?> |