Merge branch 'develop' into bug/6211-fix-contact-nets-all

2018-12-02 10:24:50 -05:00
parent 663ba65f17 5a3991d4f7
commit 924869ab5b
104 changed files with 903 additions and 956 deletions
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -41,7 +41,7 @@ class Contact extends BaseModule

 		$nets = defaults($_GET, 'nets', '');

-		if (!x($a->page, 'aside')) {
+		if (empty($a->page['aside'])) {
 			$a->page['aside'] = '';
 		}