summaryrefslogtreecommitdiff
path: root/modules/rss
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-09-16 07:02:22 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-09-16 07:02:22 -0700
commitb8201a71127a096a51ed03e0e08a98a66f847c8f (patch)
treed806f0b9f35fc3aa912126ad3cf8d67c19ec0def /modules/rss
parent15515fd3c64dd626746468862d5b8777679d88f6 (diff)
parentf1887422f8b4ba68dc273fe6f7d3f1123681e89a (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
Diffstat (limited to 'modules/rss')
-rw-r--r--modules/rss/controllers/rss.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index b89bed40..015d6032 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -21,13 +21,13 @@ class Rss_Controller extends Controller {
public static $page_size = 20;
public function feed($module_id, $feed_id, $id=null) {
- $page = $this->input->get("page", 1);
+ $page = (int) $this->input->get("page", 1);
if ($page < 1) {
url::redirect(url::merge(array("page" => 1)));
}
// Configurable page size between 1 and 100, default 20
- $page_size = max(1, min(100, $this->input->get("page_size", self::$page_size)));
+ $page_size = max(1, min(100, (int) $this->input->get("page_size", self::$page_size)));
// Run the appropriate feed callback
if (module::is_active($module_id)) {