Merge branch '2.0RC'

1 files changed, 13 insertions, 15 deletions

diff --git a/include/config.php b/include/config.php
index 8c0469392..0b0e639ab 100644
--- a/include/config.php
+++ b/include/config.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file include/config.php
  * @brief Arbitrary configuration storage.
@@ -7,7 +6,6 @@
  * Arrays get stored as serialized strings.
  * Booleans are stored as integer 0/1.
  *
-
  * - <b>config</b> is used for hub specific configurations. It overrides the
  * configurations from .htconfig file. The storage is of size TEXT.
  * - <b>pconfig</b> is used for channel specific configurations and takes a
@@ -26,7 +24,7 @@
  * - get_config() and set_config() can also be done through the command line tool
  * @ref util/config.md "util/config"
  * - get_pconfig() and set_pconfig() can also be done through the command line tool
- * @ref util/pconfig.md "util/pconfig" and takes a channel_id as first argument. 
+ * @ref util/pconfig.md "util/pconfig" and takes a channel_id as first argument.
  *
  */
 
@@ -37,8 +35,8 @@ function load_config($family) {
 	Zlib\Config::Load($family);
 }
 
-function get_config($family, $key) {
-	return Zlib\Config::Get($family,$key);
+function get_config($family, $key, $default = false) {
+	return Zlib\Config::Get($family,$key,$default);
 }
 
 function set_config($family, $key, $value) {
@@ -53,8 +51,8 @@ function load_pconfig($uid) {
 	Zlib\PConfig::Load($uid);
 }
 
-function get_pconfig($uid, $family, $key, $instore = false) {
-	return Zlib\PConfig::Get($uid,$family,$key,$instore = false);
+function get_pconfig($uid, $family, $key, $default = false) {
+	return Zlib\PConfig::Get($uid,$family,$key,$default);
 }
 
 function set_pconfig($uid, $family, $key, $value) {
@@ -69,8 +67,8 @@ function load_xconfig($xchan) {
 	Zlib\XConfig::Load($xchan);
 }
 
-function get_xconfig($xchan, $family, $key) {
-	return Zlib\XConfig::Get($xchan,$family,$key);
+function get_xconfig($xchan, $family, $key, $default = false) {
+	return Zlib\XConfig::Get($xchan,$family,$key, $default);
 }
 
 function set_xconfig($xchan, $family, $key, $value) {
@@ -85,8 +83,8 @@ function load_aconfig($account_id) {
 	Zlib\AConfig::Load($account_id);
 }
 
-function get_aconfig($account_id, $family, $key) {
-	return Zlib\AConfig::Get($account_id, $family, $key);
+function get_aconfig($account_id, $family, $key, $default = false) {
+	return Zlib\AConfig::Get($account_id, $family, $key, $default);
 }
 
 function set_aconfig($account_id, $family, $key, $value) {
@@ -101,8 +99,8 @@ function load_abconfig($chan, $xhash, $family = '') {
 	return Zlib\AbConfig::Load($chan,$xhash,$family);
 }
 
-function get_abconfig($chan,$xhash,$family,$key) {
-	return Zlib\AbConfig::Get($chan,$xhash,$family,$key);
+function get_abconfig($chan,$xhash,$family,$key, $default = false) {
+	return Zlib\AbConfig::Get($chan,$xhash,$family,$key, $default);
 }
 
 function set_abconfig($chan,$xhash,$family,$key,$value) {
@@ -117,8 +115,8 @@ function load_iconfig(&$item) {
 	Zlib\IConfig::Load($item);
 }
 
-function get_iconfig(&$item, $family, $key) {
-	return Zlib\IConfig::Get($item, $family, $key);
+function get_iconfig(&$item, $family, $key, $default = false) {
+	return Zlib\IConfig::Get($item, $family, $key, $default);
 }
 
 function set_iconfig(&$item, $family, $key, $value, $sharing = false) {