This commit is contained in:
Jean-Christian Paul Denis 2023-04-15 23:30:38 +02:00
parent fa6bcd6794
commit a13a21252d
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
2 changed files with 6 additions and 6 deletions

View File

@ -27,8 +27,8 @@ use Dotclear\Plugin\Uninstaller\{
/** /**
* Settings cleaner. * Settings cleaner.
* *
* Cleaner manages entire setting namespace * Cleaner manages entire setting namespace
* except 'delete_related' which can pickup settings ns/id pairs * except 'delete_related' which can pickup settings ns/id pairs
*/ */
class Settings extends AbstractCleaner class Settings extends AbstractCleaner
@ -99,8 +99,8 @@ class Settings extends AbstractCleaner
->group('setting_ns'); ->group('setting_ns');
$res = $sql->select(); $res = $sql->select();
$rs = []; $rs = [];
$i = 0; $i = 0;
while ($res->fetch()) { while ($res->fetch()) {
$sql = new SelectStatement(); $sql = new SelectStatement();
$sql->from(dcCore::app()->prefix . dcNamespace::NS_TABLE_NAME) $sql->from(dcCore::app()->prefix . dcNamespace::NS_TABLE_NAME)

View File

@ -59,7 +59,7 @@ class Manage extends dcNsProcess
dcCore::app()->themes->loadModules((string) dcCore::app()->blog?->themes_path); dcCore::app()->themes->loadModules((string) dcCore::app()->blog?->themes_path);
} }
$define = dcCore::app()->{$type .'s'}->getDefine($_REQUEST['id']); $define = dcCore::app()->{$type . 's'}->getDefine($_REQUEST['id']);
if (!$define->isDefined()) { if (!$define->isDefined()) {
dcCore::app()->error->add(__('Unknown module id to uninstall')); dcCore::app()->error->add(__('Unknown module id to uninstall'));
dcCore::app()->adminurl?->redirect($redir[0], $redir[1], $redir[2]); dcCore::app()->adminurl?->redirect($redir[0], $redir[1], $redir[2]);
@ -111,7 +111,7 @@ class Manage extends dcNsProcess
$type = $_REQUEST['type'] == 'theme' ? 'theme' : 'plugin'; $type = $_REQUEST['type'] == 'theme' ? 'theme' : 'plugin';
$redir = $type == 'theme' ? ['admin.blog.theme', [], '#themes'] : ['admin.plugins', [], '#plugins']; $redir = $type == 'theme' ? ['admin.blog.theme', [], '#themes'] : ['admin.plugins', [], '#plugins'];
$define = dcCore::app()->{$type .'s'}->getDefine($_REQUEST['id']); $define = dcCore::app()->{$type . 's'}->getDefine($_REQUEST['id']);
$uninstaller = Uninstaller::instance()->loadModules([$define]); $uninstaller = Uninstaller::instance()->loadModules([$define]);
$fields = []; $fields = [];