Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Zotlabs/Lib/Enotify.php

@@ -648,7 +648,7 @@ class Enotify {
 		logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
 	}
 
-	static public function forma($item) {
+	static public function format($item) {
 
 		$ret = '';
 

Zotlabs/Module/Admin.php

@@ -1421,6 +1421,7 @@ class Admin extends \Zotlabs\Web\Controller {
 	function listAddonRepos() {
 		$addonrepos = [];
 		$addonDir = __DIR__ . '/../../extend/addon/';
+		if(is_dir($addonDir)) {
 			if ($handle = opendir($addonDir)) {
 				while (false !== ($entry = readdir($handle))) {
 					if ($entry != "." && $entry != "..") {
@@ -1429,6 +1430,7 @@ class Admin extends \Zotlabs\Web\Controller {
 				}
 				closedir($handle);
 			}
+		}
 		return $addonrepos;
 	}
 

Zotlabs/Module/Ping.php

@@ -286,7 +286,7 @@ class Ping extends \Zotlabs\Web\Controller {
 				foreach($r as $item) {
 					if((argv(1) === 'home') && (! intval($item['item_wall'])))
 						continue;
-					$result[] = \Zotlbas\Lib\Enotify::format($item);
+					$result[] = \Zotlabs\Lib\Enotify::format($item);
 				}
 			}
 	//		logger('ping (network||home): ' . print_r($result, true), LOGGER_DATA);