aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-29 16:46:22 -0700
committerfriendica <info@friendica.com>2013-08-29 16:46:22 -0700
commit70c0beb857d879b8c2c74ac0922f82b37717c989 (patch)
tree032175eb350fc3255f408b3734e85b1fdd541174 /mod
parentb4bd518e4032661cdfba4e17acdb94e19b23fdd2 (diff)
downloadvolse-hubzilla-70c0beb857d879b8c2c74ac0922f82b37717c989.tar.gz
volse-hubzilla-70c0beb857d879b8c2c74ac0922f82b37717c989.tar.bz2
volse-hubzilla-70c0beb857d879b8c2c74ac0922f82b37717c989.zip
block attempts to set the baseurl to an ip address if it was previously a dns name
Diffstat (limited to 'mod')
-rw-r--r--mod/page.php17
-rw-r--r--mod/settings.php2
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')),