Fixed a bug, where the "hidden" fields were having their values "mang…

…led" by the root server.
MAGSHARE · Apr 18, 2013 · cbed42e · cbed42e
1 parent 6bfc49a
commit cbed42e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/README b/README
@@ -49,6 +49,7 @@ CHANGELIST
 = Version 2.0.2 =
 * TBD
 * Fixed an issue where sessions were not being preserved properly across a cURL call.
+* Fixed a bug, where the "hidden" fields were having their values "mangled" by the root server.
 
 = Version 2.0.1 =
 * April 17, 2013

diff --git a/main_server/client_interface/csv/search_results_csv.php b/main_server/client_interface/csv/search_results_csv.php
@@ -249,7 +249,8 @@ function DisplaySearchResultsCSV ( $in_http_vars,	/**< The various HTTP GET and
 								                                        - 'longitude' The longitude of the search center
 								                                        - 'latitude' Th latitude of the search center
 								                                */
-								    &$return_results = null ///< If supplied, should point to an array that will be filled with the actual meeting objects that comprise the result.
+								    &$return_results = null,    ///< If supplied, should point to an array that will be filled with the actual meeting objects that comprise the result.
+                                    $in_supress_hidden_concat = false   ///< If true, then hidden fields will not have their prompts encoded
 								)
 {
 	$ret = null;
@@ -449,7 +450,7 @@ function DisplaySearchResultsCSV ( $in_http_vars,	/**< The various HTTP GET and
                                     }
                                 }
 
-                            if ( $mtg_obj->IsItemHidden ( $key ) && $val )
+                            if ( $mtg_obj->IsItemHidden ( $key ) && $val && !$in_supress_hidden_concat )
                                 {
                                 if ( $mtg_obj->UserCanObserve() )
                                     {

diff --git a/main_server/local_server/server_admin/c_comdef_admin_ajax_handler.class.php b/main_server/local_server/server_admin/c_comdef_admin_ajax_handler.class.php
@@ -1197,7 +1197,7 @@ function GetSearchResults (
         $ignore_me = null;
         $meeting_objects = array();
 
-        $result = DisplaySearchResultsCSV ( $in_http_vars, $ignore_me, $geocode_results, $meeting_objects );
+        $result = DisplaySearchResultsCSV ( $in_http_vars, $ignore_me, $geocode_results, $meeting_objects, true );
 
         if ( isset ( $meeting_objects ) &&  is_array ( $meeting_objects ) && count ( $meeting_objects ) && isset ( $formats_ar ) && is_array ( $formats_ar ) )
             {