Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Darkzero - fixed notifications bar.
  diabook-theme: update mapquery and small fix
  diabook-theme: add "population density 2010"-layer to EarthLayers-box
  fix search/new against possible email leakage
  better test of email reply visibility
  diabook-theme:small fix
  moderated comment templates
  diabook-theme: small fix
  diabook-theme: include prv_message autocomplete
  fix PM replies after autocomplete changes
  add photos to PM autocomplete, improved appearance
  rev update
  diabook-theme: small fix

* master:

3 files changed, 17 insertions, 3 deletions

diff --git a/include/conversation.php b/include/conversation.php
index e48a8e6d6..6bf673b97 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -278,6 +278,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else
 					$nickname = $a->user['nickname'];
 				
+				// prevent private email from leaking.
+				if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
+						continue;
 			
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 				if($item['author-link'] && (! $item['author-name']))
@@ -447,8 +450,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else {
 
 					// prevent private email reply to public conversation from leaking.
-					if($item['private'] && ! $threads[$threadsid]['private'])
-						continue;
+					if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
+							continue;
 
 					$comments_seen ++;
 					$comment_lastcollapsed  = false;
diff --git a/include/items.php b/include/items.php
index b1dc1708f..129499967 100644
--- a/include/items.php
+++ b/include/items.php
@@ -119,7 +119,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, 
+		`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, 
 		`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
 		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
 		`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,
diff --git a/include/plugin.php b/include/plugin.php
index 4ff78a8b4..ae8eee78a 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -70,8 +70,10 @@ function reload_plugins() {
 			$installed = array();
 
 		$parr = explode(',',$plugins);
+
 		if(count($parr)) {
 			foreach($parr as $pl) {
+
 				$pl = trim($pl);
 
 				$fname = 'addon/' . $pl . '/' . $pl . '.php';
@@ -101,6 +103,7 @@ function reload_plugins() {
 			}
 		}
 	}
+
 }}
 				
 
@@ -163,6 +166,14 @@ function call_hooks($name, &$data = null) {
 					$func = $hook[HOOK_FUNCTION];
 					$func($a,$data);
 				}
+				else {
+					// remove orphan hooks
+					q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
+						dbesc($hook[HOOK_HOOK]),
+						dbesc($hook[HOOK_FILE]),
+						dbesc($hook[HOOK_FUNCTION])
+					);
+				}
 			}
 		}
 	}