Merge branch '9.2RC'master

1 files changed, 12 insertions, 3 deletions

diff --git a/include/connections.php b/include/connections.php
index 9a6ee7d8d..efc531171 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -1,6 +1,7 @@
 <?php /** @file */
 
 use Zotlabs\Daemon\Master;
+use Zotlabs\Lib\Config;
 
 function abook_store_lowlevel($arr) {
 
@@ -67,6 +68,14 @@ function rconnect_url($channel_id,$xchan) {
 
 }
 
+/**
+ * @brief returns deliverable xchans for a channel.
+ *
+ * @param intval $channel_id
+ * @param array $filter (optional)
+ * @param boolean $flatten (optional)
+ */
+
 function deliverable_abook_xchans($channel_id, $filter = [], $flatten = true) {
 	$filter_sql = '';
 
@@ -238,7 +247,7 @@ function abook_toggle_flag($abook,$flag) {
 
 function mark_orphan_hubsxchans() {
 
-	$dirmode = intval(get_config('system','directory_mode'));
+	$dirmode = intval(Config::Get('system','directory_mode'));
 	if($dirmode == DIRECTORY_MODE_NORMAL)
 		return;
 
@@ -511,8 +520,8 @@ function remove_abook_items($channel_id, $xchan_hash) {
 function random_profile() {
 	$randfunc = db_getfunc('rand');
 
-	$checkrandom = get_config('randprofile','check'); // False by default
-	$retryrandom = intval(get_config('randprofile','retry'));
+	$checkrandom = Config::Get('randprofile','check'); // False by default
+	$retryrandom = intval(Config::Get('randprofile','retry'));
 	if($retryrandom == 0) $retryrandom = 5;
 
 	for($i = 0; $i < $retryrandom; $i++) {