aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/regdir.php4
-rw-r--r--mod/zfinger.php5
2 files changed, 2 insertions, 7 deletions
diff --git a/mod/regdir.php b/mod/regdir.php
index f12659dad..5331c1dd4 100644
--- a/mod/regdir.php
+++ b/mod/regdir.php
@@ -78,11 +78,11 @@ function regdir_init(&$a) {
}
else {
- // We can put this in the sql without the condition after 31 march 2015 assuming
+ // We can put this in the sql without the condition after 31 april 2015 assuming
// most directory servers will have updated by then
// This just makes sure it happens if I forget
- $sql_extra = ((datetime_convert() > datetime_convert('UTC','UTC','2015-03-31')) ? ' and site_valid = 1 ' : '' );
+ $sql_extra = ((datetime_convert() > datetime_convert('UTC','UTC','2015-04-31')) ? ' and site_valid = 1 ' : '' );
if($dirmode == DIRECTORY_MODE_STANDALONE) {
$r = array(array('site_url' => z_root()));
}
diff --git a/mod/zfinger.php b/mod/zfinger.php
index f4b7efd96..e236a1e73 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -239,11 +239,6 @@ function zfinger_init(&$a) {
if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL))
$ret['site']['directory_mode'] = 'normal';
- // downgrade mis-configured primaries
-
- if($dirmode == DIRECTORY_MODE_PRIMARY && z_root() != get_directory_primary())
- $dirmode = DIRECTORY_MODE_SECONDARY;
-
if($dirmode == DIRECTORY_MODE_PRIMARY)
$ret['site']['directory_mode'] = 'primary';
elseif($dirmode == DIRECTORY_MODE_SECONDARY)