diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-10-06 21:13:35 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-10-06 21:13:35 +0000 |
| commit | 7dae93afeb449193415d1537ffbd4831cb6fe88f (patch) | |
| tree | 80534daddd72b51f370942ca16b483b479a6e6c2 /modules/gallery/models | |
| parent | 46ba61da0ffd1fc15899d51bcd2a6ba70c831900 (diff) | |
| parent | ea5a4e6cfed888a562216e24125d7b703393bc67 (diff) | |
git-pulled, but had to manuall fix some conflicts.
Diffstat (limited to 'modules/gallery/models')
| -rw-r--r-- | modules/gallery/models/item.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 7bcf1f31..07f781d1 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -498,7 +498,7 @@ class Item_Model_Core extends ORM_MPTT { $base_slug = $this->slug; while (ORM::factory("item") ->where("parent_id", "=", $this->parent_id) - ->where("id", "<>", $this->id) + ->where("id", $this->id ? "<>" : "IS NOT", $this->id) ->and_open() ->where("name", "=", $this->name) ->or_where("slug", "=", $this->slug) |