diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-29 22:01:36 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-29 22:01:36 +0300 |
| commit | 6aabab4b715ff8ac00cc667e9d0a40c9868410d8 (patch) | |
| tree | 85766ce290f3a89b1039969ce31bc47138d76594 /modules/gallery/models | |
| parent | 61e55becf46ce899632bff7ce26a7208094618f0 (diff) | |
| parent | ef8751468b998baddbc6d5827a392ed6e12e5548 (diff) | |
Merge remote branch 'gallery3/master'
Conflicts:
themes/admin_wind/css/screen.css
themes/wind/css/screen.css
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) |