From ad2b9198a4556553bd360574878bb4ad11dfae97 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 Mar 2020 14:15:08 -0500 Subject: [PATCH] Remove last on/off data occurrences in additional features - Address https://github.com/friendica/friendica/issues/7999#issuecomment-589808923 --- mod/settings.php | 3 +-- src/Module/Admin/Features.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index fcbd8208d..3bc0b20a6 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -27,7 +27,6 @@ use Friendica\Core\ACL; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -597,7 +596,7 @@ function settings_content(App $a) $arr[$fname] = []; $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[DI::l10n()->t('Off'), DI::l10n()->t('On')]]; + $arr[$fname][1][] = ['feature_' . $f[0], $f[1], Feature::isEnabled(local_user(), $f[0]), $f[2]]; } } diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php index 62136f423..46c0a1384 100644 --- a/src/Module/Admin/Features.php +++ b/src/Module/Admin/Features.php @@ -73,8 +73,8 @@ class Features extends BaseAdmin foreach (array_slice($fdata, 1) as $f) { $set = DI::config()->get('feature', $f[0], $f[3]); $arr[$fname][1][] = [ - ['feature_' . $f[0], $f[1], $set, $f[2], [DI::l10n()->t('Off'), DI::l10n()->t('On')]], - ['featurelock_' . $f[0], DI::l10n()->t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', [DI::l10n()->t('Off'), DI::l10n()->t('On')]] + ['feature_' . $f[0], $f[1], $set, $f[2]], + ['featurelock_' . $f[0], DI::l10n()->t('Lock feature %s', $f[1]), $f[4], ''] ]; } }