diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-08-05 23:17:39 +0400 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-08-05 23:17:39 +0400 |
| commit | e9e84b5c3b8d754217fc6579c68231991cfb95be (patch) | |
| tree | 33a5d16e7f7f21c1b33f301ede0886790d547fe1 /apps | |
| parent | 6b78ca1a5adaf8dcd73919f872fcb5014fd61ab2 (diff) | |
| parent | c32a99b14cd463f8e8b8625dc59279064b9bdb03 (diff) | |
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/calendar/lib/app.php | 4 | ||||
| -rw-r--r-- | apps/contacts/lib/addressbook.php | 1 | ||||
| -rw-r--r-- | apps/files_versions/templates/settings.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 06f85d32250..6c55bd19884 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -383,8 +383,8 @@ class OC_Calendar_App{ $lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0; $output = array('id'=>(int)$event['id'], - 'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')), - 'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'', + 'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'), + 'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'', 'lastmodified'=>$lastmodified); $dtstart = $vevent->DTSTART; diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php index 634d59eb9bd..f31f6ae73dc 100644 --- a/apps/contacts/lib/addressbook.php +++ b/apps/contacts/lib/addressbook.php @@ -219,6 +219,7 @@ class OC_Contacts_Addressbook{ OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OCP\Util::DEBUG); OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OCP\Util::DEBUG); OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OCP\Util::DEBUG); + return array(); } return $addressbooks; diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php index c3a856bc196..8682fc0f499 100644 --- a/apps/files_versions/templates/settings.php +++ b/apps/files_versions/templates/settings.php @@ -1,4 +1,4 @@ -<form id="versions"> +<form id="versionssettings"> <fieldset class="personalblock"> <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable Files Versioning'); ?></label> <br/> </fieldset> |