diff options
| -rw-r--r-- | codebase/strategy.php | 4 | ||||
| -rw-r--r-- | codebase/treedatamultitable_connector.php | 2 | ||||
| -rw-r--r-- | codebase/treegridmultitable_connector.php | 1 | ||||
| -rw-r--r-- | codebase/treemultitable_connector.php | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/codebase/strategy.php b/codebase/strategy.php index f9a106f..39c0188 100644 --- a/codebase/strategy.php +++ b/codebase/strategy.php @@ -245,7 +245,7 @@ class MultitableTreeRenderStrategy extends TreeRenderStrategy { private $level = 0; private $max_level = null; - protected $sep = "#"; + protected $sep = ","; public function __construct($conn) { parent::__construct($conn); @@ -341,7 +341,7 @@ class MultitableTreeRenderStrategy extends TreeRenderStrategy { $this->max_level = $max_level; } public function parse_id($id, $set_level = true) { - $parts = explode('#', urldecode($id)); + $parts = explode($this->sep, $id, 2); if (count($parts) === 2) { $level = $parts[0] + 1; $id = $parts[1]; diff --git a/codebase/treedatamultitable_connector.php b/codebase/treedatamultitable_connector.php index 8dba8c6..104770e 100644 --- a/codebase/treedatamultitable_connector.php +++ b/codebase/treedatamultitable_connector.php @@ -28,7 +28,7 @@ class TreeDataMultitableConnector extends TreeDataConnector{ public function xml_start(){ if (isset($_GET[$this->parent_name])) { - return "<data parent='".$this->render->level_id($_GET[$this->parent_name], $this->render->get_level() - 1)."'>"; + return "<data parent='".$this->xmlentities($this->render->level_id($_GET[$this->parent_name], $this->render->get_level() - 1))."'>"; } else { return "<data parent='0'>"; } diff --git a/codebase/treegridmultitable_connector.php b/codebase/treegridmultitable_connector.php index 3f4bbd9..31217f9 100644 --- a/codebase/treegridmultitable_connector.php +++ b/codebase/treegridmultitable_connector.php @@ -11,7 +11,6 @@ class TreeGridMultitableConnector extends TreeGridConnector{ $data_type="TreeGridMultitableDataProcessor"; if (!$render_type) $render_type="MultitableTreeRenderStrategy"; parent::__construct($res,$type,$item_type,$data_type,$render_type); - $this->render->set_separator("%23"); } public function render(){ diff --git a/codebase/treemultitable_connector.php b/codebase/treemultitable_connector.php index 09bb19b..b06164c 100644 --- a/codebase/treemultitable_connector.php +++ b/codebase/treemultitable_connector.php @@ -28,7 +28,7 @@ class TreeMultitableConnector extends TreeConnector{ public function xml_start(){ if (isset($_GET[$this->parent_name])) { - return "<tree id='".($this->render->level_id($_GET[$this->parent_name], $this->get_level() - 1))."'>"; + return "<tree id='".$this->xmlentities($this->render->level_id($_GET[$this->parent_name], $this->get_level() - 1))."'>"; } else { return "<tree id='0'>"; } |