eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into devel 

Conflicts:

	classes/CommandInterpreter.php
	lib/twitter.php
	lib/util.php
This commit is contained in:
Evan Prodromou 2009-01-06 17:09:39 -05:00
parent 4bb522c3fa d3b1c1af16
commit 02877224b2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classes/CommandInterpreter.php
View File

@ -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;
}