Merge pull request #69 from kprajapatii/master

multiselect bug fix
AyeCode · Feb 23, 2018 · 0c288ff · 0c288ff
2 parents 83a3629 + 6f4ac5b
commit 0c288ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/includes/admin/settings/class-geodir-settings-cpt-cf-extras.php b/includes/admin/settings/class-geodir-settings-cpt-cf-extras.php
@@ -449,8 +449,8 @@ class="gd-help-tip gd-help-tip-float-none gd-help-tip-no-margin dashicons dashic
 		public static function multiselect_input($output,$result_str,$cf,$field_info){
 			ob_start();
 
-			$extra = maybe_unserialize($field_info->extra_fields);
-			$multi_display_type = isset($extra['multi_display_type']) ? $extra['multi_display_type'] : $extra ;
+			$extra_fields = !empty($field_info->extra_fields) ? maybe_unserialize($field_info->extra_fields) : NULL;
+			$multi_display_type = isset($extra_fields['multi_display_type']) ? $extra_fields['multi_display_type'] : 'select';
 			?>
 			<li class="gd-advanced-setting">
 				<label for="multi_display_type" class="gd-cf-tooltip-wrap">

diff --git a/includes/custom-fields/input-functions.php b/includes/custom-fields/input-functions.php
@@ -640,10 +640,8 @@ function geodir_cfi_multiselect($html,$cf){
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
-        $multi_display = 'select';
-        if (!empty($cf['extra_fields'])) {
-            $multi_display = unserialize($cf['extra_fields']);
-        }
+        $extra_fields = !empty($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : NULL;
+		$multi_display = !empty($extra_fields['multi_display_type']) ? $extra_fields['multi_display_type'] : 'select';
         ?>
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">