Merge https://github.com/redmatrix/hubzilla into pending_merge

3 files changed, 7 insertions, 2 deletions

diff --git a/mod/admin.php b/mod/admin.php
index aaf00b14f..8fe9c8336 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -557,7 +557,7 @@ function admin_page_dbsync(&$a) {
 		}
 	}
 	if(! count($failed))
-		return '<h3>' . t('No failed updates.') . '</h3>';
+		return '<div class="generic-content-wrapper-styled"><h3>' . t('No failed updates.') . '</h3></div>';
 
 	$o = replace_macros(get_markup_template('failed_updates.tpl'),array(
 		'$base' => $a->get_baseurl(true),
diff --git a/mod/connedit.php b/mod/connedit.php
index c3fcc6d54..c8f83b0e8 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -654,7 +654,7 @@ function connedit_content(&$a) {
 
 		$locstr = '';
 
-		$locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'",
+		$locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s' and hubloc_network = 'zot'",
 			dbesc($contact['xchan_hash'])
 		);
 
diff --git a/mod/pubsites.php b/mod/pubsites.php
index 726c681fa..ae8601366 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -13,6 +13,8 @@ function pubsites_content(&$a) {
 	}
 	$url .= '/sites';
 
+	$o .= '<div class="generic-content-wrapper-styled">';
+
 	$o .= '<h1>' . t('Public Sites') . '</h1>';
 
 	$o .= '<div class="descriptive-text">' . 
@@ -33,6 +35,9 @@ function pubsites_content(&$a) {
 			}
 	
 			$o .= '</table>';
+
+			$o .= '</div>';
+
 		}
 	}
 	return $o;