Merge branch '1.0.x' of /home/ian/public_html/statusnet-enhancements

7 files changed, 11 insertions, 8 deletions

diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index 5afbb7fd2..09a457924 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -71,6 +71,7 @@ class ActivityContext
 
         $links = $element->getElementsByTagNameNS(ActivityUtils::ATOM, ActivityUtils::LINK);
 
+        $attention = array();
         for ($i = 0; $i < $links->length; $i++) {
 
             $link = $links->item($i);
@@ -80,11 +81,12 @@ class ActivityContext
             // XXX: Deprecate this in favour of "mentioned" from Salmon spec
             // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SALR
             if ($linkRel == self::ATTENTION) {
-                $this->attention[] = $link->getAttribute(self::HREF);
+                $attention[] = $link->getAttribute(self::HREF);
             } elseif ($linkRel == self::MENTIONED) {
-                $this->attention[] = $link->getAttribute(self::HREF);
+                $attention[] = $link->getAttribute(self::HREF);
             }
         }
+        $this->attention = array_unique($attention);
     }
 
     /**
diff --git a/lib/common.php b/lib/common.php
index f04bd64b7..570666da7 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.3');
+define('STATUSNET_VERSION', '0.9.4beta2');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Half a World Away');
+define('STATUSNET_CODENAME', 'Orange Crush');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
diff --git a/lib/language.php b/lib/language.php
index d93e4e0ad..80d256807 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -310,6 +310,7 @@ function get_all_languages() {
         'da'      => array('q' => 0.8, 'lang' => 'da', 'name' => 'Danish', 'direction' => 'ltr'),
         'de'      => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'),
         'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
+        'eo'      => array('q' => 0.8, 'lang' => 'eo',    'name' => 'Esperanto', 'direction' => 'ltr'),
         'en-us'   => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'),
         'en-gb'   => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
         'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English (US)', 'direction' => 'ltr'),
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 464c718f9..f9552c1dc 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -333,7 +333,7 @@ class MysqlSchema extends Schema
         }
 
         if (empty($name)) {
-            $name = "$table_".implode("_", $columnNames)."_idx";
+            $name = "{$table}_".implode("_", $columnNames)."_idx";
         }
 
         $res = $this->conn->query("ALTER TABLE $table ".
diff --git a/lib/noticelist.php b/lib/noticelist.php
index dbc5bfb51..529d6a3f9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -499,7 +499,7 @@ class NoticeListItem extends Widget
         $ns = $this->notice->getSource();
 
         if ($ns) {
-            $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name);
+            $source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _('web')) : _($ns->name);
             $this->out->text(' ');
             $this->out->elementStart('span', 'source');
             // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
diff --git a/lib/statusnet.php b/lib/statusnet.php
index ac5d10134..ff0502915 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -141,7 +141,7 @@ class StatusNet
             return true;
         }
 
-        $sn = Status_network::staticGet($nickname);
+        $sn = Status_network::staticGet('nickname', $nickname);
         if (empty($sn)) {
             return false;
             throw new Exception("No such site nickname '$nickname'");
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 91faa8c36..fc98c77d4 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -649,7 +649,7 @@ class StompQueueManager extends QueueManager
      */
     protected function updateSiteConfig($nickname)
     {
-        $sn = Status_network::staticGet($nickname);
+        $sn = Status_network::staticGet('nickname', $nickname);
         if ($sn) {
             $this->switchSite($nickname);
             if (!in_array($nickname, $this->sites)) {