diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-03-07 23:38:44 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-03-07 23:38:44 +0100 |
commit | ae7aab2d6e727f9daf683056001a982aad242c93 (patch) | |
tree | 9dc0ade66c54dc846f4591587393aacd11be8622 /apps/contacts/templates | |
parent | 91d85e9b1640e9d62707cd1c232c8c7a9fc8b9c3 (diff) | |
parent | d8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb (diff) | |
download | nextcloud-server-ae7aab2d6e727f9daf683056001a982aad242c93.tar.gz nextcloud-server-ae7aab2d6e727f9daf683056001a982aad242c93.zip |
Merge gitorious.org:owncloud/owncloud into vcategories
Conflicts:
apps/contacts/ajax/saveproperty.php
apps/contacts/lib/vcard.php
Diffstat (limited to 'apps/contacts/templates')
-rw-r--r-- | apps/contacts/templates/part.contactphoto.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php index 9e3f5876cd1..8107650d161 100644 --- a/apps/contacts/templates/part.contactphoto.php +++ b/apps/contacts/templates/part.contactphoto.php @@ -3,7 +3,7 @@ $id = $_['id']; $wattr = isset($_['width'])?'width="'.$_['width'].'"':''; $hattr = isset($_['height'])?'height="'.$_['height'].'"':''; ?> -<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkToAbsolute('contacts', 'photo.php'); ?>?id=<?php echo $id; ?>&refresh=<?php echo rand(); ?>" /> +<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkToAbsolute('contacts', 'photo.php'); ?>?id=<?php echo $id; ?>" /> <progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress> |