Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 20ac8592..60059c61 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -36,7 +36,7 @@ class movie_Core {
    */
   static function create($parent, $filename, $name, $title,
                          $description=null, $owner_id=null, $slug=null) {
-    if (!$parent->loaded || !$parent->is_album()) {
+    if (!$parent->loaded() || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
 
@@ -90,11 +90,11 @@ class movie_Core {
     // Randomize the name if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $movie->name)
-           ->orwhere("slug", $movie->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $movie->name)
+           ->or_where("slug", "=", $movie->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $movie->name = "{$name}.$rand.{$pi['extension']}";