[mjr] Avoid PHP warnings due to corrupt preference values (Bug #14585).

horde · Feb 24, 2017 · 1dde87a · 1dde87a
1 parent 0ef893b
commit 1dde87a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.2.14-git
 -----------
 
+[mjr] Avoid PHP warnings due to corrupt preference values (Bug #14585).
 
 
 -------

diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
@@ -1703,6 +1703,10 @@ static protected function _getOwner($task)
     static public function getSyncLists()
     {
         $cs = unserialize($GLOBALS['prefs']->getValue('sync_lists'));
+
+        // Bug #14585 Filter out erroneous null values.
+        $cs = array_filter($cs);
+
         if (!empty($cs)) {
             // Have a pref, make sure it's still available
             $lists = self::listTasklists(false, Horde_Perms::DELETE);

diff --git a/nag/package.xml b/nag/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [mjr] Avoid PHP warnings due to corrupt preference values (Bug #14585).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1779,7 +1779,7 @@
    <date>2016-11-09</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [mjr] Avoid PHP warnings due to corrupt preference values (Bug #14585).
    </notes>
   </release>
  </changelog>