slideshow and rss feed now show more images

diff --git a/start.php b/start.php
index 60dc465793e3b884e528d6055226bde2aa84703d..270173fcf20806c04aec4ce4137fce0c739fb0e6 100644 (file)
--- a/start.php
+++ b/start.php
@@ -457,7 +457,12 @@ function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
                return $returnvalue;
        }
 
-       $slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
+       $url = current_page_url();
+       if (strpos($url, '?')) {
+               $url = substr($url, 0, strpos($url, '?'));
+       }
+       $url = "$url?limit=50&view=rss";
+       $slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:'$url'})";
 
        // add the slideshow javascript to the header
        elgg_extend_view('metatags', 'tidypics/js/slideshow');

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index a37fdd041085f4bb515196c7955c0246d462b4a3..8df98cf7a5a8607930d6dc80bdf686a3289d3160 100644 (file)
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -42,11 +42,13 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 <?php
        }
 
+       $limit = get_input('limit', 20);
 
        $images = elgg_get_entities(array(
                "type" => "object",
                "subtype" => "image",
                "container_guid" => $album->guid,
+               "limit" => $limit,
        ));