diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-26 13:22:29 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-26 13:22:29 -0700 |
| commit | 8e4889bdf1454b3ddb183c25926286d62faa642a (patch) | |
| tree | b4841171037a62bfe67142311c0adcf6cd678d08 | |
| parent | 7b91e551c41572768e94e97dddfc854cb003a002 (diff) | |
| parent | 9d7abd58ac004f8df733a8187b57f6a3bfc2520e (diff) | |
| download | volse-hubzilla-8e4889bdf1454b3ddb183c25926286d62faa642a.tar.gz volse-hubzilla-8e4889bdf1454b3ddb183c25926286d62faa642a.tar.bz2 volse-hubzilla-8e4889bdf1454b3ddb183c25926286d62faa642a.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin.php | 12 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index c6405dac2..ccb538ef5 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/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 = ''; diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 172b109c8..8f15035d1 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1421,13 +1421,15 @@ class Admin extends \Zotlabs\Web\Controller { function listAddonRepos() { $addonrepos = []; $addonDir = __DIR__ . '/../../extend/addon/'; - if ($handle = opendir($addonDir)) { - while (false !== ($entry = readdir($handle))) { - if ($entry != "." && $entry != "..") { - $addonrepos[] = $entry; + if(is_dir($addonDir)) { + if ($handle = opendir($addonDir)) { + while (false !== ($entry = readdir($handle))) { + if ($entry != "." && $entry != "..") { + $addonrepos[] = $entry; + } } + closedir($handle); } - closedir($handle); } return $addonrepos; } diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index f0caa4373..32427b06f 100644 --- a/Zotlabs/Module/Ping.php +++ b/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); |