Merge branch 'master' into tres

2015-02-01 20:30:47 -08:00
parent e6a5f78003 e58bef049d
commit aafed50a0e
12 changed files with 108 additions and 10 deletions
--- a/include/poller.php
+++ b/include/poller.php
@@ -163,6 +163,10 @@ function poller_run($argv, $argc){
 				db_utcnow(), db_quoteinterval('14 DAY')
 			);

+			$dirmode = intval(get_config('system','directory_mode'));
+			if($dirmode == DIRECTORY_MODE_SECONDARY) {
+				logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . z_root() . '&realm=' . get_directory_realm()),true));
+			}

 			/**
 			 * End Cron Weekly