From d2f157ddeaa73c2420107ea49929ff6b36176740 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 24 Feb 2012 22:27:44 -0800
Subject: [PATCH] Provide a fallback for contents of .wgaccess files.  Fixes
 bug #12328

---
 docs/changelog/7.x.x.txt  | 1 +
 lib/WebGUI/URL/Uploads.pm | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7f507ea13..989af8ae8 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
 - fixed #12327: HttpProxy does not clean up cookie jar storage locations
 - fixed #12329: FlatDiscount Sku forces you to enter in negative numbers for price
 - fixed #12334: Company name with : in it breaks email sender identity
+- fixed #12328: invalid wgaccess file in uploads
 
 7.10.24
  - fixed #12318: asset error causes asset manager to fail
diff --git a/lib/WebGUI/URL/Uploads.pm b/lib/WebGUI/URL/Uploads.pm
index b17de77dc..7fc6c9e4f 100644
--- a/lib/WebGUI/URL/Uploads.pm
+++ b/lib/WebGUI/URL/Uploads.pm
@@ -69,9 +69,9 @@ sub handler {
         }
         else {
             my $privs = JSON->new->decode($fileContents);
-            @users = @{ $privs->{users} };
-            @groups = @{ $privs->{groups} };
-            @assets = @{ $privs->{assets} };
+            @users  = @{ $privs->{users}  || [] };
+            @groups = @{ $privs->{groups} || [] };
+            @assets = @{ $privs->{assets} || [] };
             $state  = $privs->{state};
         }