Merge branch 'dev' into sabre32
This commit is contained in:
commit
bdbbe00bdf
2
boot.php
2
boot.php
@ -45,7 +45,7 @@ require_once('include/account.php');
|
|||||||
|
|
||||||
|
|
||||||
define ( 'PLATFORM_NAME', 'hubzilla' );
|
define ( 'PLATFORM_NAME', 'hubzilla' );
|
||||||
define ( 'STD_VERSION', '1.7.3' );
|
define ( 'STD_VERSION', '1.9' );
|
||||||
define ( 'ZOT_REVISION', 1.1 );
|
define ( 'ZOT_REVISION', 1.1 );
|
||||||
|
|
||||||
define ( 'DB_UPDATE_VERSION', 1176 );
|
define ( 'DB_UPDATE_VERSION', 1176 );
|
||||||
|
@ -123,7 +123,7 @@ function get_iconfig(&$item, $family, $key) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function set_iconfig(&$item, $family, $key, $value, $sharing = false) {
|
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) {
|
function del_iconfig(&$item, $family, $key) {
|
||||||
|
Reference in New Issue
Block a user