summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-06 17:09:39 -0500
committerEvan Prodromou <git@evanprodromou.name>2009-01-06 17:09:39 -0500
commit02877224b20f87af304553f739b69544d7ac4cfa (patch)
tree47d35fba742121afc15b73da371e181e3b2525e6 /classes
parent4bb522c3faa23a738c1a47440759aff741925d78 (diff)
parentd3b1c1af1620764c9f6c2e1b692338e60ed8e706 (diff)
Merge branch 'master' into devel
Conflicts: classes/CommandInterpreter.php lib/twitter.php lib/util.php
Diffstat (limited to 'classes')
-rw-r--r--classes/CommandInterpreter.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/CommandInterpreter.php b/classes/CommandInterpreter.php
index f409ed07f..0679f5462 100644
--- a/classes/CommandInterpreter.php
+++ b/classes/CommandInterpreter.php
@@ -23,7 +23,7 @@ require_once(INSTALLDIR.'/classes/Command.php');
class CommandInterpreter
{
-
+
function handle_command($user, $text)
{
# XXX: localise
@@ -33,9 +33,9 @@ class CommandInterpreter
# We try to support all the same commands as Twitter, see
# http://getsatisfaction.com/twitter/topics/what_are_the_twitter_commands
- # There are a few compatibility commands from earlier versions of
+ # There are a few compatibility commands from earlier versions of
# Laconica
-
+
switch(strtolower($cmd)) {
case 'help':
if ($arg) {
@@ -105,6 +105,7 @@ class CommandInterpreter
return new GetCommand($user, $other);
}
case 'd':
+ case 'dm':
if (!$arg) {
return null;
}