fix fatal error caused by using empty() on a function return

bgermann · Apr 25, 2017 · 5c3dbb9 · 5c3dbb9
1 parent 666bd94
commit 5c3dbb9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cforms-options.php b/cforms-options.php
@@ -207,7 +207,7 @@
                 <?php
                 $ti = 1;
 
-// pre-check for verification field
+                // pre-check for verification field
                 $ccboxused = false;
                 $emailtoboxused = false;
                 $fileupload = false; // only for hide/show options

diff --git a/lib_options_sub.php b/lib_options_sub.php
@@ -84,7 +84,7 @@
 if (!isset($_REQUEST['cforms_upload_noid']))
     $_REQUEST['cforms_upload_noid'] = "";
 $cformsSettings['form' . $no]['cforms' . $no . '_noid'] = cforms2_get_boolean_from_request('cforms_upload_noid');
-if ($uploadfield && !empty(cforms2_get_from_request('cforms_upload_dir')))
+if ($uploadfield && cforms2_get_from_request('cforms_upload_dir') != '')
     $cformsSettings['form' . $no]['cforms' . $no . '_upload_dir'] = cforms2_get_from_request('cforms_upload_dir') . '$#$' . cforms2_get_from_request('cforms_upload_dir_url');
 $cformsSettings['form' . $no]['cforms' . $no . '_upload_ext'] = cforms2_get_from_request('cforms_upload_ext');
 $cformsSettings['form' . $no]['cforms' . $no . '_upload_size'] = cforms2_get_from_request('cforms_upload_size');

diff --git a/readme.txt b/readme.txt
@@ -152,6 +152,10 @@ GPL compliance!
 
 == Changelog ==
 
+= 14.13.2 =
+
+* bugfix:   fix fatal error caused by using empty() on a function return with PHP < 5.5
+
 = 14.13.1 =
 
 * bugfix:   wrong parentheses