aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-11 20:12:41 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-11 20:12:41 +0200
commitbdbbe00bdf2e1c85cdff98bb9007eafc87b8a3c4 (patch)
treec35a20f03c3aa8f6ae5cbb4e90709e5ae159ef62
parent86985b454f75ac7f87e0dfe94fd754d7cbb0bf09 (diff)
parent96cd63cf1a569c03575c0a04a6b29509f886e981 (diff)
downloadvolse-hubzilla-bdbbe00bdf2e1c85cdff98bb9007eafc87b8a3c4.tar.gz
volse-hubzilla-bdbbe00bdf2e1c85cdff98bb9007eafc87b8a3c4.tar.bz2
volse-hubzilla-bdbbe00bdf2e1c85cdff98bb9007eafc87b8a3c4.zip
Merge branch 'dev' into sabre32
-rwxr-xr-xboot.php2
-rw-r--r--include/config.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 8e789a77f..384376ec5 100755
--- a/boot.php
+++ b/boot.php
@@ -45,7 +45,7 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'STD_VERSION', '1.7.3' );
+define ( 'STD_VERSION', '1.9' );
define ( 'ZOT_REVISION', 1.1 );
define ( 'DB_UPDATE_VERSION', 1176 );
diff --git a/include/config.php b/include/config.php
index 209d22d42..65199283d 100644
--- a/include/config.php
+++ b/include/config.php
@@ -123,7 +123,7 @@ function get_iconfig(&$item, $family, $key) {
}
function set_iconfig(&$item, $family, $key, $value, $sharing = false) {
- return Zlib\IConfig::Set($item, $family, $key, $value, $sharing = false);
+ return Zlib\IConfig::Set($item, $family, $key, $value, $sharing);
}
function del_iconfig(&$item, $family, $key) {