gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't fail during the construction of Node objects

Browse Source
This commit is contained in:
Rouslan Placella 2012-07-13 19:40:38 +01:00
parent 52fcbdf422
commit 3b4b32df27
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/navigation/Nodes/Node.class.php
View File

@ -26,18 +26,18 @@ class Node
* @var string A non-unique identifier for the node
* This may be trimmed when grouping nodes
*/
public $name;
public $name = "";
/**
* @var string A non-unique identifier for the node
* This will never change after being assigned
*/
public $real_name;
public $real_name = "";
/**
* @var int May be one of CONTAINER or OBJECT
*/
public $type;
public $type = Node::OBJECT;
/**
* @var bool Whether this object has been created while grouping nodes
@ -116,7 +116,7 @@ class Node
* @param bool $is_group Whether this object has been created
* while grouping nodes
*
* @return bool Whether the initialisation was successful
* @return Node
*/
public function __construct($name, $type = Node::OBJECT, $is_group = false)
{
@ -124,16 +124,11 @@ class Node
if (! empty($name)) {
$this->name = $name;
$this->real_name = $name;
if ($type === 0 || $type === 1) {
$this->type = $type;
if (is_bool($is_group)) {
$this->is_group = $is_group;
return true;
}
}
}
return false;
if ($type === Node::CONTAINER) {
$this->type = Node::CONTAINER;
}
$this->is_group = (bool)$is_group;
}
/**