fix reference variable effects on sorting

diff --git a/boot.php b/boot.php
index fe84913320f3b7a8d2698f3eb74c984a1c3e471c..619a3fead6376d1fac9aa4f5dd02a6519abbbeef 100644 (file)
--- 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.1214' );
+define ( 'FRIENDICA_VERSION',      '2.3.1215' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1114      );
 

diff --git a/include/conversation.php b/include/conversation.php
index f4432bfd977e1633ec534b81199162867c258b41..1b1d09d6b57c7c2f377d50262db143813c00d7d4 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -911,9 +911,13 @@ function conv_sort($arr,$order) {
                        $parents[$p]['children'][] = $x;
                }
        }
-       foreach($parents as $x)
-               if(count($x['children']))
-                       usort($x['children'],'sort_thr_created_rev');
+       foreach($parents as $k => $v) {
+               if(count($parents[$k]['children'])) {
+                       $y = $parents[$k]['children'];
+                       usort($y,'sort_thr_created_rev');
+                       $parents[$k]['children'] = $y;
+               }
+       }
 
        $ret = array();
        foreach($parents as $x) {

diff --git a/include/items.php b/include/items.php
index 9becb9ffb74ece6dba203b887df3a7a7496847e1..7f003ab5750c34665a4de81e401b39d4b4e68ec5 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -945,7 +945,7 @@ function tgroup_deliver($uid,$item_id) {
 
        $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
-       $cnt = preg_match_all('/\@\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+       $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
        if($cnt) {
                foreach($matches as $mtch) {
                        if(link_compare($link,$mtch[1])) {

diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index c7cc082976459a4931aad2f729a409318154b09f..72cf8e4fd8a828004542590db10d3acded5438b7 100644 (file)
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -12,7 +12,7 @@
 
   <id>$feed_id</id>
   <title>$feed_title</title>
-  <generator uri="http://friendika.com" version="$version">Friendika</generator>
+  <generator uri="http://friendica.com" version="$version">Friendica</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon