[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43201] branches/9.x/lib/tikilib.php

[<ar...@us...>]

Revision: 43201
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43201&view=rev
Author:   arildb
Date:     2012-09-29 17:52:50 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
[bp/r42813][FIX] notification about invalid array to string conversion

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42813&view=rev

Modified Paths:
--------------
    branches/9.x/lib/tikilib.php

Modified: branches/9.x/lib/tikilib.php
===================================================================
--- branches/9.x/lib/tikilib.php	2012-09-29 17:52:34 UTC (rev 43200)
+++ branches/9.x/lib/tikilib.php	2012-09-29 17:52:50 UTC (rev 43201)
@@ -3209,7 +3209,13 @@
 			$name = $result['name'];
 			$value = $result['value'];
 
-			if ( !isset($defaults[$name]) || (string) $defaults[$name] != (string) $value )
+			$strDef = "";
+			if(isset($defaults[$name]) && is_array($defaults[$name])) {
+				$strDef = implode(" ", $defaults[$name]);
+			} else {
+				$strDef = isset($defaults[$name]) ? $defaults[$name] : "";
+			}
+			if ( empty($strDef) || ($strDef != (string) $value) )
 				$modified[$name] = $value;
 		}
 		return $modified;

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