Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

1 files changed, 7 insertions, 2 deletions

diff --git a/scripts/settag.php b/scripts/settag.php
index e91d5eb50..d1b06ff10 100644
--- a/scripts/settag.php
+++ b/scripts/settag.php
@@ -33,13 +33,12 @@ END_OF_SETTAG_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-if (count($args) != 2) {
+if (count($args) < 1) {
     show_help();
     exit(1);
 }
 
 $nickname = $args[0];
-$tag = strtolower($args[1]);
 
 $sn = Status_network::memGet('nickname', $nickname);
 
@@ -50,6 +49,12 @@ if (empty($sn)) {
 
 $tags = $sn->getTags();
 
+if (count($args) == 1) {
+	print(implode(', ', $tags) . "\n");
+	exit(0);
+}
+$tag = $args[1];
+
 $i = array_search($tag, $tags);
 
 if ($i !== false) {