Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
7fc575e750
|
@ -261,6 +261,7 @@ class PreferenceController extends Zend_Controller_Action
|
|||
{
|
||||
$path = $path.'/';
|
||||
$handle = opendir($path);
|
||||
if ($handle !== false){
|
||||
while (false !== ($file = readdir($handle))) {
|
||||
if ($file != "." && $file != "..") {
|
||||
//only show directories that aren't private.
|
||||
|
@ -274,6 +275,7 @@ class PreferenceController extends Zend_Controller_Action
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ksort($result);
|
||||
//returns format serverBrowse is looking for.
|
||||
die(json_encode($result));
|
||||
|
|
Loading…
Reference in New Issue