diff --git a/htdocs/always.php b/htdocs/always.php index 058818a5..ae79d791 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -203,7 +203,7 @@ if ( function_exists('awl_set_locale') ) { * */ $c->code_version = 0; -$c->want_awl_version = '0.55'; +$c->want_awl_version = '0.56'; $c->version_string = '1.1.3.1'; // The actual version # is replaced into that during the build /release process if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) { $c->code_major = $matches[1]; diff --git a/inc/caldav-PUT-vcard.php b/inc/caldav-PUT-vcard.php index 419e2bc5..727bf960 100644 --- a/inc/caldav-PUT-vcard.php +++ b/inc/caldav-PUT-vcard.php @@ -103,8 +103,7 @@ elseif( !preg_match('{^\d{8}T\d{6}Z$}', $last_modified) ) { $vcard->ClearProperties('REV'); $vcard->AddProperty('REV',$last_modified); } - -$rendered_card = $vcard->Render(); +$rendered_card = $vcard->Render(); $etag = md5($rendered_card); $params = array( ':user_no' => $user_no, diff --git a/inc/vcard.php b/inc/vcard.php index bccf7874..7fc890dc 100644 --- a/inc/vcard.php +++ b/inc/vcard.php @@ -93,7 +93,9 @@ CREATE TABLE addressbook_address_adr ( $type = $adr->GetParameterValue('TYPE'); if ( is_array($type) ) $type = implode('~|~',$type); $params[':type'] = $type; - $address = explode(';',$adr->Value()); + //explode on ; that is not preceeded by an \ + $address = preg_split( '{(?Value()); + //$address = explode(';',$adr->Value()); // We use @ to suppress the warnings here, because the NULL in the database suits us well. @$params[':box_no'] = $address[0];