Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 43 insertions, 40 deletions

diff --git a/classes/Message.php b/classes/Message.php
index ef4bd0316..4806057b4 100644
--- a/classes/Message.php
+++ b/classes/Message.php
@@ -22,47 +22,50 @@ class Message extends Memcached_DataObject
     public $source;                          // varchar(32)  
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Message',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Message',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-	
-	function getFrom() {
-		return Profile::staticGet('id', $this->from_profile);
-	}
-	
-	function getTo() {
-		return Profile::staticGet('id', $this->to_profile);
-	}
-	
-	static function saveNew($from, $to, $content, $source) {
-		
-		$msg = new Message();
-		
-		$msg->from_profile = $from;
-		$msg->to_profile = $to;
-		$msg->content = common_shorten_links($content);
-		$msg->rendered = common_render_text($content);
-		$msg->created = common_sql_now();
-		$msg->source = $source;
-		
-		$result = $msg->insert();
-		
-		if (!$result) {
-			common_log_db_error($msg, 'INSERT', __FILE__);
-			return _('Could not insert message.');
-		}
-		
-		$orig = clone($msg);
-		$msg->uri = common_local_url('showmessage', array('message' => $msg->id));
-		
-		$result = $msg->update($orig);
-		
-		if (!$result) {
-			common_log_db_error($msg, 'UPDATE', __FILE__);
-			return _('Could not update message with new URI.');
-		}
-		
-		return $msg;
-	}
+    
+    function getFrom()
+    {
+        return Profile::staticGet('id', $this->from_profile);
+    }
+    
+    function getTo()
+    {
+        return Profile::staticGet('id', $this->to_profile);
+    }
+    
+    static function saveNew($from, $to, $content, $source) {
+        
+        $msg = new Message();
+        
+        $msg->from_profile = $from;
+        $msg->to_profile = $to;
+        $msg->content = common_shorten_links($content);
+        $msg->rendered = common_render_text($content);
+        $msg->created = common_sql_now();
+        $msg->source = $source;
+        
+        $result = $msg->insert();
+        
+        if (!$result) {
+            common_log_db_error($msg, 'INSERT', __FILE__);
+            return _('Could not insert message.');
+        }
+        
+        $orig = clone($msg);
+        $msg->uri = common_local_url('showmessage', array('message' => $msg->id));
+        
+        $result = $msg->update($orig);
+        
+        if (!$result) {
+            common_log_db_error($msg, 'UPDATE', __FILE__);
+            return _('Could not update message with new URI.');
+        }
+        
+        return $msg;
+    }
 }