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

This commit is contained in:
Hypolite Petovan 2018-12-02 10:24:50 -05:00 committed by GitHub
commit 924869ab5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 903 additions and 956 deletions

View file

@ -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'] = '';
}