[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[27636] branches/5.x/lib/setup/sections.php

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

Revision: 27636
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27636&view=rev
Author:   jonnybradley
Date:     2010-06-15 16:27:24 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
[FIX] Upload file: galleryId gets set to an array in upload files and this was dying in filegal manager due to freetagslib->get_similar returning an array for current object (on some slightly out of date servers)
Not fixed for itemkey case as it doesn't seem to be needed.

Modified Paths:
--------------
    branches/5.x/lib/setup/sections.php

Modified: branches/5.x/lib/setup/sections.php
===================================================================
--- branches/5.x/lib/setup/sections.php	2010-06-15 15:34:24 UTC (rev 27635)
+++ branches/5.x/lib/setup/sections.php	2010-06-15 16:27:24 UTC (rev 27636)
@@ -214,9 +214,14 @@
 				'object' => $_REQUEST[ $info['itemkey'] ],
 			);
 		} elseif( isset( $info['key'], $info['objectType'], $_REQUEST[ $info['key'] ] ) ) {
+			if (is_array($_REQUEST[ $info['key'] ])) {	// galleryId is an array here when in tiki-upload_file.php
+				$k = $_REQUEST[ $info['key'] ][0];
+			} else {
+				$k = $_REQUEST[ $info['key'] ];
+			}
 			return array(
 				'type' => $info['objectType'],
-				'object' => $_REQUEST[ $info['key'] ],
+				'object' => $k,
 			);
 		}
 	}


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