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

string update

Browse Source
This commit is contained in:
zotlabs 2016-10-30 12:34:00 -07:00
parent 321a32050b
commit 581ef6e18d
3 changed files with 621 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zotlabs/Module/Connedit.php
View File

@ -521,11 +521,12 @@ class Connedit extends \Zotlabs\Web\Controller {
if($cmd === 'drop') { if($cmd === 'drop') {
// FIXME // @FIXME
// We need to send either a purge or a refresh packet to the other side (the channel being unfriended). // We need to send either a purge or a refresh packet to the other side (the channel being unfriended).
// The issue is that the abook DB record _may_ get destroyed when we call contact_remove. As the notifier runs // The issue is that the abook DB record _may_ get destroyed when we call contact_remove. As the notifier
// in the background there could be a race condition preventing this packet from being sent in all cases. // runs in the background there could be a race condition preventing this packet from being sent in all
// PLACEHOLDER // cases.
// PLACEHOLDER
contact_remove(local_channel(), $orig_record[0]['abook_id']); contact_remove(local_channel(), $orig_record[0]['abook_id']);
build_sync_packet(0 /* use the current local_channel */, build_sync_packet(0 /* use the current local_channel */,
@ -800,9 +801,6 @@ class Connedit extends \Zotlabs\Web\Controller {
return $arr['output']; return $arr['output'];
} }
} }
} }

1172
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

4
view/en/htconfig.tpl
View File

@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
App::$config['system']['timezone'] = '{{$timezone}}'; App::$config['system']['timezone'] = '{{$timezone}}';
// What is your site name? DO NOT ADD A TRAILING SLASH! // What is your site url? DO NOT ADD A TRAILING SLASH!
App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['baseurl'] = '{{$siteurl}}';
App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['sitename'] = "Hubzilla";
@ -110,7 +110,7 @@ App::$config['system']['theme'] = 'redbasic';
// PHP error logging setup // PHP error logging setup
// Before doing this ensure that the webserver has permission // Before doing this ensure that the webserver has permission
// to create and write to php.out in the top level Red directory, // to create and write to php.out in the top level web directory,
// or change the name (below) to a file/path where this is allowed. // or change the name (below) to a file/path where this is allowed.
// Uncomment the following 4 lines to turn on PHP error logging. // Uncomment the following 4 lines to turn on PHP error logging.