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/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 155edfb5..d422636f 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -29,14 +29,14 @@ class gallery_rss_Core {
     case "latest":
       $feed->children = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
-        ->orderby("created", "DESC")
+        ->where("type", "<>", "album")
+        ->order_by("created", "DESC")
         ->find_all($limit, $offset);
 
       $all_children = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
-        ->orderby("created", "DESC");
+        ->where("type", "<>", "album")
+        ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
       $feed->title = t("Recent updates");
@@ -49,9 +49,9 @@ class gallery_rss_Core {
 
       $feed->children = $item
         ->viewable()
-        ->descendants($limit, $offset, array("type" => "photo"));
+        ->descendants($limit, $offset, array(array("type", "=", "photo")));
       $feed->max_pages = ceil(
-        $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
+        $item->viewable()->descendants_count(array(array("type", "=", "photo"))) / $limit);
       $feed->title = html::purify($item->title);
       $feed->description = nl2br(html::purify($item->description));