harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Browse Source
This commit is contained in:
Mario Vavti
2016-11-29 10:13:47 +01:00
parent f9b732482d 4a9317db6e
commit 91e97468a0
4 changed files with 791 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Connedit.php
View File

@@ -48,9 +48,6 @@ class Connedit extends \Zotlabs\Web\Controller {
}
static public function xchan_name_sort($a,$b) {
return strcasecmp($a['xchan_name'],$b['xchan_name']);
}
/* @brief Evaluate posted values and set changes
*
@@ -557,12 +554,11 @@ class Connedit extends \Zotlabs\Web\Controller {
$contact_id = \App::$poi['abook_id'];
$contact = \App::$poi;
$cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0",
$cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 order by xchan_name",
intval(local_channel())
);
if($cn) {
usort($cn, '\\Zotlabs\\Module\\Connedit::xchan_name_sort');
if($cn) {
$pntotal = count($cn);
for($x = 0; $x < $pntotal; $x ++) {