LDAP: Added TLS support

[bookstack] / app / Http / Controllers / RecycleBinController.php

diff --git a/app/Http/Controllers/RecycleBinController.php b/app/Http/Controllers/RecycleBinController.php
index 64459da23d2307c88988a7964bbd764164cb0b4b..459dbb39dfd93585ed3f5b2b6913bc814bd8bc22 100644 (file)
--- a/app/Http/Controllers/RecycleBinController.php
+++ b/app/Http/Controllers/RecycleBinController.php
@@ -14,7 +14,6 @@ class RecycleBinController extends Controller
      */
     public function __construct()
     {
      */
     public function __construct()
     {

-        // TODO - Check this is enforced.

         $this->middleware(function ($request, $next) {
             $this->checkPermission('settings-manage');
             $this->checkPermission('restrictions-manage-all');
         $this->middleware(function ($request, $next) {
             $this->checkPermission('settings-manage');
             $this->checkPermission('restrictions-manage-all');


@@ -96,7 +95,7 @@ class RecycleBinController extends Controller
      */
     public function empty()
     {
      */
     public function empty()
     {

-        $deleteCount = (new TrashCan())->destroyFromAllDeletions();
+        $deleteCount = (new TrashCan())->empty();

 
         $this->showSuccessNotification(trans('settings.recycle_bin_destroy_notification', ['count' => $deleteCount]));
         return redirect($this->recycleBinBaseUrl);
 
         $this->showSuccessNotification(trans('settings.recycle_bin_destroy_notification', ['count' => $deleteCount]));
         return redirect($this->recycleBinBaseUrl);