stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

improved handling when no public entities are available

Browse source
This commit is contained in:
Steffen Vogel 2011-03-24 22:13:37 +01:00
parent 549c3a8cef
commit 3551c924bd
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Controller/EntityController.php
View file

@ -61,11 +61,8 @@ class EntityController extends Controller {
throw new \Exception('No entity found with UUID: ' . $uuid, 404);
}
}
elseif ($publicEntities = $this->filter(array('public' => TRUE))) { // public entities
return array('entities' => $publicEntities);
}
else { // no public entities available
return array('entities' => array());
else { // public entities
return array('entities' => $this->filter(array('public' => TRUE)));
}
}
@ -121,7 +118,7 @@ class EntityController extends Controller {
});
// send new cookie to browser
setcookie('vz_uuids', implode(';', array_unique($uuids)), 0, '/'); // TODO correct path
setcookie('vz_uuids', implode(';', array_unique($uuids)), 0, '/'); // TODO correct path
}
/**

4
lib/View/JSON.php
View file

@ -240,6 +240,10 @@ class JSON extends View {
*
*/
protected function addArray($data, &$refNode) {
if (is_null($refNode)) {
$refNode = array();
}
foreach ($data as $index => $value) {
if ($value instanceof Util\JSON || is_array($value)) {
$this->addArray($value, $refNode[$index]);