Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

diff --git a/classes/Notice.php b/classes/Notice.php
index 28d5b8ddf940bb2f7bbed2e50c2ea69e7a8140ff..89afe9d1dca74da958082c68153e8bb01d560230 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -732,6 +732,10 @@ class Notice extends Memcached_DataObject
             return new ArrayWrapper($notices);
         } else {
             $notice = new Notice();
+            if (empty($ids)) {
+                //if no IDs requested, just return the notice object
+                return $notice;
+            }
             $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
             $notice->orderBy('id DESC');
 

diff --git a/classes/Status_network.php b/classes/Status_network.php
index d526cb4d617ab49651df4138617bc43f944edd80..fe4f0b0c580c7f14d8fc0c91150488fc3331abdc 100644 (file)
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -54,7 +54,7 @@ class Status_network extends DB_DataObject
         global $config;
 
         $config['db']['database_'.$dbname] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
-        $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/statusnet.ini';
+        $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini';
         $config['db']['table_status_network'] = $dbname;
 
         self::$cache = new Memcache();

diff --git a/lib/common.php b/lib/common.php
index 39d4ffc9b9c3999dd715eea61b8121f8391fcec3..88d77732f4cda50508fe33e94585048baf56454c 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-define('STATUSNET_VERSION', '0.8.1');
+define('STATUSNET_VERSION', '0.8.2dev');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Second Guessing');

diff --git a/lib/twitterbasicauthclient.php b/lib/twitterbasicauthclient.php
index 66bb01e539c72d20f6bff37aa5904447ea9e9613..fd331fbdc90966289abd9d5c342eb34c8280adf0 100644 (file)
--- a/lib/twitterbasicauthclient.php
+++ b/lib/twitterbasicauthclient.php
@@ -74,7 +74,7 @@ class TwitterBasicAuthClient
     }
 
     /**
-     * Calls Twitter's /stutuses/update API method
+     * Calls Twitter's /statuses/update API method
      *
      * @param string $status                text of the status
      * @param int    $in_reply_to_status_id optional id of the status it's
@@ -94,7 +94,7 @@ class TwitterBasicAuthClient
     }
 
     /**
-     * Calls Twitter's /stutuses/friends_timeline API method
+     * Calls Twitter's /statuses/friends_timeline API method
      *
      * @param int $since_id show statuses after this id
      * @param int $max_id   show statuses before this id
@@ -123,7 +123,7 @@ class TwitterBasicAuthClient
     }
 
     /**
-     * Calls Twitter's /stutuses/friends API method
+     * Calls Twitter's /statuses/friends API method
      *
      * @param int $id          id of the user whom you wish to see friends of
      * @param int $user_id     numerical user id
@@ -153,7 +153,7 @@ class TwitterBasicAuthClient
     }
 
     /**
-     * Calls Twitter's /stutuses/friends/ids API method
+     * Calls Twitter's /statuses/friends/ids API method
      *
      * @param int $id          id of the user whom you wish to see friends of
      * @param int $user_id     numerical user id
@@ -163,7 +163,7 @@ class TwitterBasicAuthClient
      * @return mixed a list of ids, 100 per page
      */
     function friendsIds($id = null, $user_id = null, $screen_name = null,
-                         $page = null)
+                        $page = null)
     {
         $url = "https://twitter.com/friends/ids.json";
 

diff --git a/lib/util.php b/lib/util.php
index edc08d4c127b96df29bffd3d8c65cfc934104c21..7228b3fe3e81ce755a0b715e93bd2b7f2ef98d51 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -450,7 +450,7 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
     '#ixu';
     preg_match_all($regex,$text,$matches);
     //print_r($matches);
-    return preg_replace_callback($regex, curry(callback_helper,$callback,$notice_id) ,$text);
+    return preg_replace_callback($regex, curry('callback_helper',$callback,$notice_id) ,$text);
 }
 
 function callback_helper($matches, $callback, $notice_id) {