aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-11-29 10:13:47 +0100
committerMario Vavti <mario@mariovavti.com>2016-11-29 10:13:47 +0100
commit91e97468a096474afe0444135f789293f74c422c (patch)
tree0336c48e808960fc02baaa51a7f8ca5b8448ed2d /Zotlabs
parentf9b732482d1776ba0c8cad593157589189f6bedd (diff)
parent4a9317db6e94e6f2d2d1a3074c7429d3e92377b5 (diff)
downloadvolse-hubzilla-91e97468a096474afe0444135f789293f74c422c.tar.gz
volse-hubzilla-91e97468a096474afe0444135f789293f74c422c.tar.bz2
volse-hubzilla-91e97468a096474afe0444135f789293f74c422c.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Connedit.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 9dfa871f7..47e1ce167 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -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 ++) {