Commit 0f72b085 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #35 in ZP/z-push from...

Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop

* commit 'e6b04fab':
  ZP-676 Removed trailing space. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-676 Fix to handle incoming STREAMER_TYPE_SEND_EMPTY property type. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 113e7645)
parent 71e0f49f
...@@ -96,14 +96,16 @@ class Streamer implements Serializable { ...@@ -96,14 +96,16 @@ class Streamer implements Serializable {
$map = $this->mapping[$entity[EN_TAG]]; $map = $this->mapping[$entity[EN_TAG]];
if (isset($map[self::STREAMER_ARRAY])) { if (isset($map[self::STREAMER_ARRAY])) {
$this->$map[self::STREAMER_VAR] = array(); $this->$map[self::STREAMER_VAR] = array();
} else if(!isset($map[self::STREAMER_TYPE])) { }
else if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
$this->$map[self::STREAMER_VAR] = "1";
}
else if(!isset($map[self::STREAMER_TYPE])) {
$this->$map[self::STREAMER_VAR] = ""; $this->$map[self::STREAMER_VAR] = "";
} }
else if ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES ) { else if ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES ) {
$this->$map[self::STREAMER_VAR] = ""; $this->$map[self::STREAMER_VAR] = "";
} }
else if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY)
$this->$map[self::STREAMER_VAR] = "";
continue; continue;
} }
// Found a start tag // Found a start tag
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment