[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[20832] trunk/lib/toolbars/toolbarslib.php

[<jon...@us...>]

Revision: 20832
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20832&view=rev
Author:   jonnybradley
Date:     2009-08-13 23:48:32 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
[FIX] Tool editing: Fixed uninitialised array problem (array_merge with a null value results in null - nice)

Modified Paths:
--------------
    trunk/lib/toolbars/toolbarslib.php

Modified: trunk/lib/toolbars/toolbarslib.php
===================================================================
--- trunk/lib/toolbars/toolbarslib.php	2009-08-13 15:52:28 UTC (rev 20831)
+++ trunk/lib/toolbars/toolbarslib.php	2009-08-13 23:48:32 UTC (rev 20832)
@@ -126,9 +126,10 @@
 		global $prefs;
 		if( isset($prefs['toolbar_custom_list']) ) {
 			$custom = @unserialize($prefs['toolbar_custom_list']);
+			sort($custom);
+		} else {
+			$custom = array();
 		}
-		
-		sort($custom);
 
 		return $custom;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.