Merge pull request #478 from hhunderter/master

Fix: DateTime on New MySQL/MariaDB Versions
IlchCMS · Jun 11, 2020 · c7f8628 · c7f8628
2 parents 2b3afb2 + 0a7ab40
commit c7f8628
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/application/modules/user/controllers/admin/Index.php b/application/modules/user/controllers/admin/Index.php
@@ -119,7 +119,7 @@ public function indexAction()
         $pagination->setPage($this->getRequest()->getParam('page'));
 
         if ($this->getRequest()->getParam('showselectsdelete')) {
-            $entries = $userMapper->getUserList(['selectsdelete >' => 0], $pagination);
+            $entries = $userMapper->getUserList(['selectsdelete >' => '1000-01-01 00:00:00'], $pagination);
         } else if ($this->getRequest()->getParam('showsetfree')) {
             $entries = $userMapper->getUserList(['confirmed' => 0], $pagination);
             if (empty($entries)) {
@@ -137,7 +137,7 @@ public function indexAction()
             ->set('errorMsg', $this->getRequest()->getParam('errorMsg'))
             ->set('badge', count($userMapper->getUserList(['confirmed' => 0])))
             ->set('badgeLocked', count($userMapper->getUserList(['locked' => 1])))
-            ->set('badgeSelectsDelete', count($userMapper->getUserList(['selectsdelete >' => 0])))
+            ->set('badgeSelectsDelete', count($userMapper->getUserList(['selectsdelete >' => '1000-01-01 00:00:00'])))
             ->set('timetodelete', $this->getConfig()->get('userdeletetime'))
             ->set('pagination', $pagination);
     }

diff --git a/application/modules/user/mappers/User.php b/application/modules/user/mappers/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Ilch 2.0
+ * @copyright Ilch 2
  * @package ilch
  */
 
@@ -515,7 +515,7 @@ public function deleteUserToGroup($userId, $groupId)
      *
      * @return boolean True of success, otherwise false.
      */
-     public function selectsdelete($userId, $deletedate = '')
+     public function selectsdelete($userId, $deletedate = '1000-01-01 00:00:00')
      {
         if (is_a($userId, '\Modules\User\Models\User')) {
             $userId = $userId->getId();
@@ -539,7 +539,7 @@ public function deleteselectsdelete($timetodelete = 5)
         $date = new \Ilch\Date();
         $date->modify('-'.$timetodelete.' days');
 
-        $entries = $this->getUserList(['selectsdelete >' => 0, 'selectsdelete <=' => $date]);
+        $entries = $this->getUserList(['selectsdelete >' => '1000-01-01 00:00:00', 'selectsdelete <=' => $date]);
 
         foreach ($entries as $user) {
             if ($user->getSelectsDelete() != '') {