fix reference variable effects on sorting
This commit is contained in:
parent
184230e068
commit
c583d16209
2
boot.php
2
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 );
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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])) {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user