From f3c6260c3eb1cd63d284e38b9c3b4d2418fbdfb6 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sat, 6 Sep 2014 22:02:56 +1000
Subject: [PATCH] Slightly different fix to #580. Closes #580

---
 modules/backend/formwidgets/FileUpload.php | 5 +++--
 modules/backend/widgets/Form.php           | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index 4349442a3..a3fdc0096 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -7,6 +7,7 @@ use System\Models\File;
 use System\Classes\SystemException;
 use Backend\Classes\FormWidgetBase;
 use October\Rain\Support\ValidationException;
+use Exception;
 
 /**
  * File upload field
@@ -163,7 +164,7 @@ class FileUpload extends FormWidgetBase
 
             throw new SystemException('Unable to find file, it may no longer exist');
         }
-        catch (\Exception $ex) {
+        catch (Exception $ex) {
             return json_encode(['error' => $ex->getMessage()]);
         }
     }
@@ -219,7 +220,7 @@ class FileUpload extends FormWidgetBase
             $result = $file;
 
         }
-        catch (\Exception $ex) {
+        catch (Exception $ex) {
             $result = json_encode(['error' => $ex->getMessage()]);
         }
 
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 19e6beda9..946a28d18 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -549,7 +549,7 @@ class Form extends WidgetBase
             return $this->formWidgets[$field->columnName];
 
         $widgetConfig = $this->makeConfig($field->config);
-        $widgetConfig->alias = $this->alias . studly_case($field->columnName);
+        $widgetConfig->alias = $this->alias . studly_case(Str::evalHtmlId($field->columnName));
         $widgetConfig->sessionKey = $this->getSessionKey();
 
         $widgetName = $widgetConfig->widget;