Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 11 insertions, 11 deletions

diff --git a/include/ratenotif.php b/include/ratenotif.php
index 4fa0077a6..63fd7c2ee 100644
--- a/include/ratenotif.php
+++ b/include/ratenotif.php
@@ -76,8 +76,8 @@ function ratenotif_run($argv, $argc){
 		if($j && $j['success'] && is_array($j['directories'])) {
 
 			foreach($j['directories'] as $h) {
-//				if($h == z_root())
-//					continue;
+				if($h == z_root())
+					continue;
 
 				$hash = random_string();
 				$n = zot_build_packet($channel,'notify',null,null,$hash);
@@ -94,21 +94,21 @@ function ratenotif_run($argv, $argc){
 					dbesc($n),
 					dbesc(json_encode($encoded_item))
 				);
-			}
-			$deliver[] = $hash;
 
-			if(count($deliver) >= $deliveries_per_process) {
-				proc_run('php','include/deliver.php',$deliver);
-				$deliver = array();
-				if($interval)
-					@time_sleep_until(microtime(true) + (float) $interval);
-			}
+				$deliver[] = $hash;
 
+				if(count($deliver) >= $deliveries_per_process) {
+					proc_run('php','include/deliver.php',$deliver);
+					$deliver = array();
+					if($interval)
+						@time_sleep_until(microtime(true) + (float) $interval);
+				}
+			}
 
 			// catch any stragglers
 
 			if(count($deliver)) {
-			proc_run('php','include/deliver.php',$deliver);
+				proc_run('php','include/deliver.php',$deliver);
 			}
 		}
 	}