X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Ffront%2Fcontroller%2Fadmin%2FShaareManageController.php;h=9633cd51696e09978e500d5b4be0ca90860afe89;hb=93175b6e9d5cfa4d4319bd58b9de01824d596288;hp=2ed298f5e4cefb163371bf372df7eeb5c7241c7e;hpb=47d15818502b11315b484131aaf67a3e3f441c5a;p=github%2Fshaarli%2FShaarli.git diff --git a/application/front/controller/admin/ShaareManageController.php b/application/front/controller/admin/ShaareManageController.php index 2ed298f5..9633cd51 100644 --- a/application/front/controller/admin/ShaareManageController.php +++ b/application/front/controller/admin/ShaareManageController.php @@ -54,7 +54,7 @@ class ShaareManageController extends ShaarliAdminController $data = $formatter->format($bookmark); $this->executePageHooks('delete_link', $data); $this->container->bookmarkService->remove($bookmark, false); - ++ $count; + ++$count; } if ($count > 0) { @@ -66,6 +66,10 @@ class ShaareManageController extends ShaarliAdminController return $response->write(''); } + if ($request->getParam('source') === 'batch') { + return $response->withStatus(204); + } + // Don't redirect to permalink after deletion. return $this->redirectFromReferer($request, $response, ['shaare/']); } @@ -125,7 +129,7 @@ class ShaareManageController extends ShaarliAdminController // To preserve backward compatibility with 3rd parties, plugins still use arrays $data = $formatter->format($bookmark); $this->executePageHooks('save_link', $data); - $bookmark->fromArray($data); + $bookmark->fromArray($data, $this->container->conf->get('general.tags_separator', ' ')); $this->container->bookmarkService->set($bookmark, false); ++$count; @@ -167,7 +171,7 @@ class ShaareManageController extends ShaarliAdminController // To preserve backward compatibility with 3rd parties, plugins still use arrays $data = $formatter->format($bookmark); $this->executePageHooks('save_link', $data); - $bookmark->fromArray($data); + $bookmark->fromArray($data, $this->container->conf->get('general.tags_separator', ' ')); $this->container->bookmarkService->set($bookmark);