git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 7d07149f authored by Evan Prodromou's avatar Evan Prodromou

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

parents ea0a1b6a 8f7f06e3
......@@ -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;
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment