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

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 420dd2a7cfbe86b1d7639fff3f1433ead79c7c4e..14e21ae4fdc15f8ad8980862bc473a57d8e16fd8 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -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;

diff --git a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
index b2e988b5e1eca1c9521ea3de318ebee7014ecf71..a30ab110ab688212c320a1accd5dea68cec2c91c 100644 (file)
--- a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
+++ b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
@@ -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();