aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2023-04-13 11:37:01 +0200
committerMario Vavti <mario@mariovavti.com>2023-04-13 11:37:01 +0200
commit824497b97a2bcd0afe7a74c94e3992723c22ccdf (patch)
treed13832b70f1fe611b35b9fb153401cbbdb0fbbdd
parent0b7bece8e3b252cc3a234f86607f4f7f9b416ddd (diff)
downloadvolse-hubzilla-824497b97a2bcd0afe7a74c94e3992723c22ccdf.tar.gz
volse-hubzilla-824497b97a2bcd0afe7a74c94e3992723c22ccdf.tar.bz2
volse-hubzilla-824497b97a2bcd0afe7a74c94e3992723c22ccdf.zip
fix wrong array key, check for xchan_deleted with empty() which will also catch a possibly already removed xchan (which will be null) and bump version
-rw-r--r--Zotlabs/Lib/Libzot.php6
-rw-r--r--boot.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 13634e8dd..b75e4e135 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -721,7 +721,7 @@ class Libzot {
$hidden_changed = 1;
if (isset($arr['adult_content']) && intval($r[0]['xchan_selfcensored']) != intval($arr['adult_content']))
$adult_changed = 1;
- if (isset($arr['xchan_deleted']) && intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
+ if (isset($arr['deleted']) && intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
$deleted_changed = 1;
// new style 6-MAR-2019
@@ -2724,12 +2724,12 @@ class Libzot {
$e = $r[0];
$id = $e['channel_id'];
- $sys_channel = (intval($e['channel_system']) ? true : false);
+ $sys_channel = ((empty($e['channel_system'])) ? false : true);
$special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false);
$adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false);
$censored = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false);
$searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
- $deleted = (intval($e['xchan_deleted']) ? true : false);
+ $deleted = ((empty($e['xchan_deleted'])) ? false : true);
if ($deleted || $censored || $sys_channel)
$searchable = false;
diff --git a/boot.php b/boot.php
index d8349c2e2..4eb1f7132 100644
--- a/boot.php
+++ b/boot.php
@@ -60,7 +60,7 @@ require_once('include/bbcode.php');
require_once('include/items.php');
define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '8.3.1');
+define('STD_VERSION', '8.3.2');
define('ZOT_REVISION', '6.0');
define('DB_UPDATE_VERSION', 1255);