rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-03 15:24:09 +01:00
Code Issues Releases Activity

Move decoding vCard properties to start of upgrade.

Browse Source
This commit is contained in:
Thomas Tanghus 2013-05-15 22:58:07 +02:00
parent 04ddf9eeb8
commit 54e4693b7f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/vobject/vcard.php
View File

@ -143,6 +143,21 @@ class VCard extends VObject\Component\VCard {
$warnings = array(); $warnings = array();
if ($options & self::UPGRADE) {
$this->VERSION = self::DEFAULT_VERSION;
foreach($this->children as &$property) {
$this->decodeProperty($property);
switch((string)$property->name) {
case 'LOGO':
case 'SOUND':
case 'PHOTO':
if(isset($property['TYPE']) && strpos((string)$property['TYPE'], '/') === false) {
$property['TYPE'] = 'image/' . strtolower($property['TYPE']);
}
}
}
}
$version = $this->select('VERSION'); $version = $this->select('VERSION');
if (count($version) !== 1) { if (count($version) !== 1) {
$warnings[] = array( $warnings[] = array(
@ -229,21 +244,6 @@ class VCard extends VObject\Component\VCard {
} }
} }
if ($options & self::UPGRADE) {
$this->VERSION = self::DEFAULT_VERSION;
foreach($this->children as &$property) {
$this->decodeProperty($property);
switch((string)$property->name) {
case 'LOGO':
case 'SOUND':
case 'PHOTO':
if(isset($property['TYPE']) && strpos((string)$property['TYPE'], '/') === false) {
$property['TYPE'] = 'image/' . strtolower($property['TYPE']);
}
}
}
}
return array_merge( return array_merge(
parent::validate($options), parent::validate($options),
$warnings $warnings