diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /modules/slideshow/helpers | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'modules/slideshow/helpers')
| -rw-r--r-- | modules/slideshow/helpers/slideshow_event.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 0afe8126..9b77dd42 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -32,7 +32,7 @@ class slideshow_event_Core { static function album_menu($menu, $theme) { $descendants_count = ORM::factory("item", $theme->item()->id) - ->descendants_count(array("type" => "photo")); + ->descendants_count(array(array("type", "=", "photo"))); if ($descendants_count > 1) { $menu->append(Menu::factory("link") ->id("slideshow") |