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
commit 91e97468a0
4 changed files with 791 additions and 780 deletions
Show Stats 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 /* @brief Evaluate posted values and set changes
* *
@ -557,12 +554,11 @@ class Connedit extends \Zotlabs\Web\Controller {
$contact_id = \App::$poi['abook_id']; $contact_id = \App::$poi['abook_id'];
$contact = \App::$poi; $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()) intval(local_channel())
); );
if($cn) {
usort($cn, '\\Zotlabs\\Module\\Connedit::xchan_name_sort');
if($cn) {
$pntotal = count($cn); $pntotal = count($cn);
for($x = 0; $x < $pntotal; $x ++) { for($x = 0; $x < $pntotal; $x ++) {

2
boot.php
View File

@ -48,7 +48,7 @@ require_once('include/zid.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.15.1' ); define ( 'STD_VERSION', '1.15.2' );
define ( 'ZOT_REVISION', '1.1' ); define ( 'ZOT_REVISION', '1.1' );
define ( 'DB_UPDATE_VERSION', 1185 ); define ( 'DB_UPDATE_VERSION', 1185 );

8
include/zot.php
View File

@ -425,6 +425,10 @@ function zot_refresh($them, $channel = null, $force = false) {
$next_birthday = NULL_DATE; $next_birthday = NULL_DATE;
} }
// Keep original perms to check if we need to notify them
$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
dbesc($x['hash']), dbesc($x['hash']),
intval($channel['channel_id']) intval($channel['channel_id'])
@ -488,10 +492,6 @@ function zot_refresh($them, $channel = null, $force = false) {
} }
} }
// Keep original perms to check if we need to notify them
$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
$closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness'); $closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness');
if($closeness === false) if($closeness === false)
$closeness = 80; $closeness = 80;

1553
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff