From 2c06c715c7440148c6d866926536430940372635 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20Mudr=C3=A1k?= Date: Wed, 6 Feb 2013 17:37:07 +0100 Subject: [PATCH] MDL-37893 Allow elements with no final tags to form a grouped path --- .../processors/grouped_parser_processor.class.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backup/util/xml/parser/processors/grouped_parser_processor.class.php b/backup/util/xml/parser/processors/grouped_parser_processor.class.php index d8e260ad01a..2989d26660b 100644 --- a/backup/util/xml/parser/processors/grouped_parser_processor.class.php +++ b/backup/util/xml/parser/processors/grouped_parser_processor.class.php @@ -76,6 +76,17 @@ abstract class grouped_parser_processor extends simplified_parser_processor { * @param string $path xml path which parsing has started */ public function before_path($path) { + if ($this->path_is_grouped($path) and !isset($this->currentdata[$path])) { + // If the grouped element itself does not contain any final tags, + // we would not get any chunk data for it. So we add an artificial + // empty data chunk here that will be eventually replaced with + // real data later in {@link self::postprocess_chunk()}. + $this->currentdata[$path] = array( + 'path' => $path, + 'level' => substr_count($path, '/') + 1, + 'tags' => array(), + ); + } if (!$this->grouped_parent_exists($path)) { parent::before_path($path); } @@ -167,7 +178,7 @@ abstract class grouped_parser_processor extends simplified_parser_processor { */ protected function build_currentdata($grouped, $data) { // Check the grouped already exists into currentdata - if (!array_key_exists($grouped, $this->currentdata)) { + if (!is_array($this->currentdata) or !array_key_exists($grouped, $this->currentdata)) { $a = new stdclass(); $a->grouped = $grouped; $a->child = $data['path']; -- 2.36.1