GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

This commit is contained in:
Evan Prodromou 2012-04-16 15:44:03 -04:00
parent ea0a1b6a03 8f7f06e35a
commit 7d07149f60
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/apiaction.php
View File

@ -958,9 +958,9 @@ class ApiAction extends Action
$to_profile = $message->getTo();
$dmsg['id'] = intval($message->id);
$dmsg['sender_id'] = intval($from_profile);
$dmsg['sender_id'] = intval($from_profile->id);
$dmsg['text'] = trim($message->content);
$dmsg['recipient_id'] = intval($to_profile);
$dmsg['recipient_id'] = intval($to_profile->id);
$dmsg['created_at'] = $this->dateTwitter($message->created);
$dmsg['sender_screen_name'] = $from_profile->nickname;
$dmsg['recipient_screen_name'] = $to_profile->nickname;

3
plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
View File

@ -117,7 +117,7 @@ class DomainStatusNetworkInstaller extends Installer
$this->rootname = $config['ADMIN'];
$this->rootpass = $config['ADMINPASS'];
$this->sitehost = $config['DBHOST'];
$this->sitehost = $config['SITEDBHOSTNAME'];
$this->sitedb = $config['SITEDB'];
$tagstr = $config['TAGS'];
@ -178,6 +178,7 @@ class DomainStatusNetworkInstaller extends Installer
$sn->dbpass = $this->password;
$sn->dbname = $this->database;
$sn->sitename = $this->sitename;
$sn->created = common_sql_now();
$result = $sn->insert();