harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
redmatrix 2016-05-26 13:22:29 -07:00
commit 8e4889bdf1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/Enotify.php
View File

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

12
Zotlabs/Module/Admin.php
View File

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

2
Zotlabs/Module/Ping.php
View File

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