merge of '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'

     and 'f556521018478109967b108bb830f8109aefbb0e'

1 files changed, 8 insertions, 2 deletions

diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index 53317ebb03..98751ea26c 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -46,9 +46,15 @@ if(!check_database())
 
 $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
 
-if($argc > 1 AND $argv[1] == 'upgrades')
+if($argc == 2)
 {
-	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'");
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_uri = '${argv[1]}'");
+} else if ($argc == 3 && $argv[1] == "--type") {
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = '${argv[2]}'");
+}
+
+if (!$feeds) {
+    die("Cannot find feed(s) in the DB\n");
 }
 
 $start = time();