aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-02-28 19:37:56 +0000
committerplegall <plg@piwigo.org>2010-02-28 19:37:56 +0000
commit4c209bf180f3ab7775b71c00eaf780b8aab38fa5 (patch)
tree1759b77516777656c8eff96561063878627d0ecb
parentd4287e2ad82770d8903dc1eb6cb906bb690de63a (diff)
merge r5001 from branch 2.0 to trunk
bug 1469 fixed: I should have permitted an empty feed in URL in r4742 git-svn-id: http://piwigo.org/svn/trunk@5002 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--feed.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/feed.php b/feed.php
index 5d015c573..fcb59c6f0 100644
--- a/feed.php
+++ b/feed.php
@@ -63,7 +63,7 @@ function ts_to_iso8601($ts)
// | initialization |
// +-----------------------------------------------------------------------+
-check_input_parameter('feed', $_GET['feed'], false, '/^[0-9a-z]{50}$/i');
+check_input_parameter('feed', @$_GET['feed'], false, '/^[0-9a-z]{50}$/i');
$feed_id= isset($_GET['feed']) ? $_GET['feed'] : '';
$image_only=isset($_GET['image_only']);