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

perlDreamer · perlDreamer · commit d2f157ddeaa7 · 2012-02-24T22:27:44.000-08:00
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};
         }
 

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ sub handler {`
`69`	`69`	`}`
`70`	`70`	`else {`
`71`	`71`	`my $privs = JSON->new->decode($fileContents);`
`72`		`- @users = @{ $privs->{users} };`
`73`		`- @groups = @{ $privs->{groups} };`
`74`		`- @assets = @{ $privs->{assets} };`
	`72`	`+ @users = @{ $privs->{users} \|\| [] };`
	`73`	`+ @groups = @{ $privs->{groups} \|\| [] };`
	`74`	`+ @assets = @{ $privs->{assets} \|\| [] };`
`75`	`75`	`$state = $privs->{state};`
`76`	`76`	`}`
`77`	`77`