Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/util.php b/lib/util.php
index 5d16e39b5..e0eda0114 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -519,11 +519,16 @@ function common_shorten_links($text)
 
 function common_shorten_link($url, $reverse = false)
 {
+
     static $url_cache = array();
     if ($reverse) return isset($url_cache[$url]) ? $url_cache[$url] : $url;
 
     $user = common_current_user();
-
+    if (!isset($user)) {
+      // common current user does not find a user when called from the XMPP daemon
+      // therefore we'll set one here fix, so that XMPP given URLs may be shortened
+      $user->urlshorteningservice = 'ur1.ca';
+    }
     $curlh = curl_init();
     curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
     curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
@@ -1334,4 +1339,3 @@ function common_database_tablename($tablename)
   //table prefixes could be added here later
   return $tablename;
 }
-