Merge branch 'pull'

diff --git a/boot.php b/boot.php
index 5c72af156e644f6eb2b96e15b2ed1cbab3e84e9b..2c9bb68d19b26b70ebfb35857074835beaca6a26 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1257' );
+define ( 'FRIENDICA_VERSION',      '2.3.1258' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1122      );
 

diff --git a/include/enotify.php b/include/enotify.php
index a8e6e3de6d6fc449d30aba31da0a428935f7aab9..b0967cff1baed59aa530be8e25dc5c655b3b9552 100755 (executable)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -28,7 +28,7 @@ function notification($params) {
                $subject =      sprintf( t('New mail received at %s'),$sitename);
 
                $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
-               $epreamble = sprintf( t('%s sent you a private message.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
+               $epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $siteurl . '/message]' . t('a private message') . '[/url]');
                $sitelink = t('Please visit %s to view and/or reply to your private messages.');
                $tsitelink = sprintf( $sitelink, $siteurl . '/message' );
                $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message">' . $sitename . '</a>');
@@ -39,7 +39,7 @@ function notification($params) {
 
                $subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename);
                $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); 
-               $epreamble = sprintf( t('%s commented on an item/conversation you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+               $epreamble = sprintf( t('%s commented on %s you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('an item/conversation') . '[/url]'); 
 
                $sitelink = t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf( $sitelink, $siteurl );
@@ -49,7 +49,7 @@ function notification($params) {
 
        if($params['type'] == NOTIFY_WALL) {
                $preamble = $subject =  sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename);
-               $epreamble = sprintf( t('%s posted to your profile wall') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+               $epreamble = sprintf( t('%s posted to %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('your profile wall.') . '[/url]'); 
                
                $sitelink = t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf( $sitelink, $siteurl );
@@ -59,7 +59,7 @@ function notification($params) {
 
        if($params['type'] == NOTIFY_TAGSELF) {
                $preamble = $subject =  sprintf( t('%s tagged you at %s') , $params['source_name'], $sitename);
-               $epreamble = sprintf( t('%s tagged you') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+               $epreamble = sprintf( t('%s %s.') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('tagged you') . '[/url]'); 
 
                $sitelink = t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf( $sitelink, $siteurl );
@@ -69,7 +69,7 @@ function notification($params) {
 
        if($params['type'] == NOTIFY_TAGSHARE) {
                $preamble = $subject =  sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename);
-               $epreamble = sprintf( t('%s tagged your post') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+               $epreamble = sprintf( t('%s tagged %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('your post') . '[/url]' ); 
 
                $sitelink = t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf( $sitelink, $siteurl );
@@ -80,7 +80,7 @@ function notification($params) {
        if($params['type'] == NOTIFY_INTRO) {
                $subject = sprintf( t('Introduction received at %s'), $sitename);
                $preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); 
-               $epreamble = sprintf( t('You\'ve received an introduction from %s'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+               $epreamble = sprintf( t('You\'ve received %s from %s.'), '[url=' . $params['link'] . ']' . t('an introduction') . '[/url]' , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
                $body = sprintf( t('You may visit their profile at %s'),$params['source_link']);
 
                $sitelink = t('Please visit %s to approve or reject the introduction.');
@@ -92,7 +92,8 @@ function notification($params) {
        if($params['type'] == NOTIFY_SUGGEST) {
                $subject = sprintf( t('Friend suggestion received at %s'), $sitename);
                $preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename); 
-               $epreamble = sprintf( t('You\'ve received a friend suggestion for %s from %s'),
+               $epreamble = sprintf( t('You\'ve received %s for %s from %s.'),
+                       '[url=' . $params['link'] . ']' . t('a friend suggestion') . '[/url]',
                        '[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]', 
                        '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
                $body = t('Name:') . ' ' . $params['item']['name'] . "\n";

diff --git a/include/items.php b/include/items.php
index f4837449d72ff7a61b97b7d024e954f2066ec3c7..f87a92334c1776f22aa67f92853406e494c2be43 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -1700,7 +1700,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                if(! is_array($contact))
                                        return;
 
-                               if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) {
+                               if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) {
                                        if(strlen($datarray['title']))
                                                unset($datarray['title']);
                                        $datarray['last-child'] = 1;
@@ -2074,7 +2074,7 @@ function local_delivery($importer,$data) {
                                $datarray = get_atom_elements($feed,$item);
 
 
-               // TODO: make this next part work against both delivery threads of a community post
+                               // TODO: make this next part work against both delivery threads of a community post
 
 //                             if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
 //                                     logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 

diff --git a/include/text.php b/include/text.php
index 044ee4e085a9cd2dd5045b4793c1d0ddf9c66814..5ef870fd75225d65da744628f00d84ae97fd5893 100755 (executable)
--- a/include/text.php
+++ b/include/text.php
@@ -776,13 +776,11 @@ function smilies($s, $sample = false) {
        else {
                $s = str_replace($params['texts'],$params['icons'],$params['string']);
        }
-             
+
        return $s;
 
 }}
 
-
-
 if(! function_exists('day_translate')) {
 function day_translate($s) {
        $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),