Provide a fallback for contents of .wgaccess files. Fixes bug #12328

plainblack · Feb 25, 2012 · d2f157d · d2f157d
1 parent 99fa73a
commit d2f157d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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};
         }