aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-03 14:27:00 -0800
committerfriendica <info@friendica.com>2012-01-03 14:27:00 -0800
commitc583d1620955b8d170b8cbf7a106cefeecad56c8 (patch)
tree4d70947824ea489c72725c88e15d663d9cf8f788
parent184230e06826117b1d87241e3acdf19935470e8f (diff)
downloadvolse-hubzilla-c583d1620955b8d170b8cbf7a106cefeecad56c8.tar.gz
volse-hubzilla-c583d1620955b8d170b8cbf7a106cefeecad56c8.tar.bz2
volse-hubzilla-c583d1620955b8d170b8cbf7a106cefeecad56c8.zip
fix reference variable effects on sorting
-rw-r--r--boot.php2
-rw-r--r--include/conversation.php10
-rw-r--r--include/items.php2
-rw-r--r--view/atom_feed.tpl2
4 files changed, 10 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index fe8491332..619a3fead 100644
--- 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 f4432bfd9..1b1d09d6b 100644
--- 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 9becb9ffb..7f003ab57 100644
--- 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 c7cc08297..72cf8e4fd 100644
--- 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