diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-05-28 13:59:47 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-05-28 13:59:47 +0200 |
| commit | 1eebbaebdb8d36564c07e616d74dd7fac0929c46 (patch) | |
| tree | 11de8530705091a9b96008ccaacdc18badd016b2 | |
| parent | c79a529edda3992bffc9e7dd1c7949f42c3b8f57 (diff) | |
| parent | df5bdc8e42a39ee8c74aac91ddbd03aef2731586 (diff) | |
| download | nextcloud-server-1eebbaebdb8d36564c07e616d74dd7fac0929c46.tar.gz nextcloud-server-1eebbaebdb8d36564c07e616d74dd7fac0929c46.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | apps/calendar/js/calendar.js | 1 | ||||
| -rw-r--r-- | apps/contacts/lib/vcard.php | 2 | ||||
| -rw-r--r-- | apps/contacts/templates/part.contacts.php | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index e27fe49c54f..b5411d3fd95 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -207,6 +207,7 @@ Calendar={ }, showCalDAVUrl:function(username, calname){ $('#caldav_url').val(totalurl + '/' + username + '/' + calname); + $('#caldav_url').val(encodeURI($('#caldav_url').val())); $('#caldav_url').show(); $("#caldav_url_close").show(); }, diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index 2414efe6764..a8ad695f620 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -227,7 +227,7 @@ class OC_Contacts_VCard{ $vcard->setString('FN', $fn); OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn,OCP\Util::DEBUG); } - if(!$n || $n = ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-) + if(!$n || $n == ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-) $slice = array_reverse(array_slice(explode(' ', $fn), 0, 2)); // Take 2 first name parts of 'FN' and reverse. if(count($slice) < 2) { // If not enought, add one more... $slice[] = ""; diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php index 00a61f72fdd..57517505405 100644 --- a/apps/contacts/templates/part.contacts.php +++ b/apps/contacts/templates/part.contacts.php @@ -8,5 +8,5 @@ } } ?> - <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li> + <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li> <?php endforeach; ?> |