From d2704764cf26e4de50e48babaa675e8c45c6c1d6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 30 Apr 2014 19:49:25 +0200
Subject: use new $INPUT->valid() method in feed.php

---
 feed.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'feed.php')

diff --git a/feed.php b/feed.php
index c1a5f4503..40f9af659 100644
--- a/feed.php
+++ b/feed.php
@@ -141,12 +141,10 @@ function rss_parseOptions() {
 
     $opt['guardmail'] = ($conf['mailguard'] != '' && $conf['mailguard'] != 'none');
 
-    $type = valid_input_set(
-        'type', array(
-                     'rss', 'rss2', 'atom', 'atom1', 'rss1',
-                     'default' => $conf['rss_type']
-                ),
-        $_REQUEST
+    $type = $INPUT->valid(
+        'type',
+        array( 'rss', 'rss2', 'atom', 'atom1', 'rss1'),
+        $conf['rss_type']
     );
     switch($type) {
         case 'rss':
-- 
cgit v1.2.3