Merge commit 'refs/merge-requests/11' of git://gitorious.org/statusnet/gnu-social...

[quix0rs-gnu-social.git] / lib / commandinterpreter.php

diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index fe426f1fcd3a41f6b4a6515a2fcaaf10079f561e..d1574c55fda95dca5bd4ef01abe62f9899351cbf 100644 (file)
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -274,6 +274,32 @@ class CommandInterpreter
                     }
                 }
                 break;
+             case 'list':
+             case 'tag':
+                if (!$arg) {
+                    $result = null;
+                    break;
+                }
+                list($other, $tags) = $this->split_arg($arg);
+                if (!$tags) {
+                    $result = null;
+                } else {
+                    $result = new TagCommand($user, $other, $tags);
+                }
+                break;
+             case 'unlist':
+             case 'untag':
+                if (!$arg) {
+                    $result = null;
+                    break;
+                }
+                list($other, $tags) = $this->split_arg($arg);
+                if (!$tags) {
+                    $result = null;
+                } else {
+                    $result = new UntagCommand($user, $other, $tags);
+                }
+                break;
             case 'track':
                 if (!$arg) {
                     $result = null;
@@ -313,8 +339,8 @@ class CommandInterpreter
             default:
                 $result = false;
             }
-                
-            Event::handle('EndInterpretCommand', array($cmd, $arg, $user, $result));
+
+            Event::handle('EndInterpretCommand', array($cmd, $arg, $user, &$result));
         }
 
         return $result;