Changeset 3299:18dc878c1178

Timestamp:

08/05/16 12:05:20 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Protect media sorting callback function from null arg(s)

Files:

• CHANGELOG (modified) (1 diff)
• inc/core/class.dc.media.php (modified) (2 diffs)

CHANGELOG

@@ -37 +37 @@
 * New behaviour adminPageHTTPheaders
 * New "Go Top" button displayed for long admin pages
-* 🐛 → Various bugs and typos fixes
+* 🐛 → Various bugs and typos fixed
 * 🌼 → Some locales and cosmetic adjustments
 

inc/core/class.dc.media.php

@@ -350 +350 @@
      protected function sortFileHandler($a,$b)
      {
+          if (is_null($a) || is_null($b)) {
+               return (is_null($a) ? 1 : -1);
+          }
           switch ($this->file_sort)
           {
@@ -485 +488 @@
                }
           }
-          usort($this->dir['files'],array($this,'sortFileHandler'));
+          try {
+               usort($this->dir['files'],array($this,'sortFileHandler'));
+          } catch (Exception $e) {}
      }