From 78a100e6fc3d13a208d0b0ddbba4ebb7826d7d6b Mon Sep 17 00:00:00 2001 From: Milan Medlik Date: Mon, 22 Jul 2013 15:36:15 +1200 Subject: [PATCH] remove rendered --- inc/vComponent.php | 2 +- inc/vProperty.php | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/inc/vComponent.php b/inc/vComponent.php index fe40341..bb4efad 100644 --- a/inc/vComponent.php +++ b/inc/vComponent.php @@ -462,7 +462,7 @@ foreach( $this->properties AS $k => $v ) { if ( isset($testtypes[$v->Name()]) && $testtypes[$v->Name()] ) { unset($this->properties[$k]); - if ( isset($this->rendered) ) unset($this->rendered); + } } $this->properties = array_values($this->properties); diff --git a/inc/vProperty.php b/inc/vProperty.php index 1b308db..9ef2dc6 100644 --- a/inc/vProperty.php +++ b/inc/vProperty.php @@ -101,7 +101,7 @@ class vProperty extends vObject { unset($this->seek); } - unset($this->rendered); + } @@ -356,15 +356,13 @@ class vProperty extends vObject { function Render( $force = false ) { // If we still have the string it was parsed in from, it hasn't been screwed with // and we can just return that without modification. - if ( $force === false && $this->isValid() && isset($this->rendered) && strlen($this->rendered) < 73 ) { - return $this->rendered; - } +// if ( $force === false && $this->isValid() && isset($this->rendered) && strlen($this->rendered) < 73 ) { +// return $this->rendered; +// } // in case one of the memberts doesn't set -> try parse from rendered if(!isset($this->name) || !isset($this->content) || !isset($this->parameters)) { - $this->ParseFromIterator(); - } $property = preg_replace( '/[;].*$/', '', $this->name ); @@ -395,18 +393,20 @@ class vProperty extends vObject { $escaped = preg_replace( "/([,;])/", '\\\\$1', $escaped); } + $rendered = ''; + $property = sprintf( "%s%s:", $this->name, $this->RenderParameters() ); if ( (strlen($property) + strlen($escaped)) <= 72 ) { - $this->rendered = $property . $escaped; + $rendered = $property . $escaped; } else if ( (strlen($property) <= 72) && (strlen($escaped) <= 72) ) { - $this->rendered = $property . "\r\n " . $escaped; + $rendered = $property . "\r\n " . $escaped; } else { - $this->rendered = preg_replace( '/(.{72})/u', '$1'."\r\n ", $property.$escaped ); + $rendered = preg_replace( '/(.{72})/u', '$1'."\r\n ", $property.$escaped ); } // trace_bug( 'Re-rendered "%s" property.', $this->name ); - return $this->rendered; + return $rendered; } -- 2.11.4.GIT