block attempts to set the baseurl to an ip address if it was previously a dns name

2 files changed, 10 insertions, 9 deletions

diff --git a/mod/page.php b/mod/page.php
index 4b2b95b6a..110d9699c 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -6,16 +6,17 @@ require_once('include/page_widgets.php');
 
 function page_init(&$a) {
 	// We need this to make sure the channel theme is always loaded.
-        $which = argv(1);
-        $profile = 0;
-        $channel = $a->get_channel();
 
-        if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
-                $which = $channel['channel_address'];
-                $profile = argv(1);
-        }
+	$which = argv(1);
+	$profile = 0;
+	$channel = $a->get_channel();
 
-        profile_load($a,$which,$profile);
+	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+		$which = $channel['channel_address'];
+		$profile = argv(1);
+	}
+
+	profile_load($a,$which,$profile);
 
 }
 
diff --git a/mod/settings.php b/mod/settings.php
index 2a3a64581..6b21066b1 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -997,7 +997,7 @@ function settings_content(&$a) {
 
 		$stpl = get_markup_template('settings.tpl');
 
-		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+		$celeb = false;
 
 		$expire_arr = array(
 			'days' => array('expire',  t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),