Merge branch 'hotfix-2.2.34' into develop

pull/304/merge
iglocska 2014-08-06 13:47:51 +02:00
commit a6a353252e
2 changed files with 4 additions and 1 deletions

View File

@ -6,9 +6,11 @@ INSTALLATION INSTRUCTIONS
1/ Minimal ubuntu install
-------------------------
Install a minimal ubuntu 12.04-server system with the software:
- OpenSSH server
- LAMP server
- LAMP server (don't forget php5-mysql)
- Mail server
You will get some questions, you will probably want to set:

View File

@ -1025,6 +1025,7 @@ class Event extends AppModel {
$attributes = $this->Attribute->find('all', $params);
foreach ($attributes as &$attribute) {
$attribute['Attribute']['value'] = str_replace(array("\r\n", "\n", "\r"), "", $attribute['Attribute']['value']);
$attribute['Attribute']['value'] = '"' . $attribute['Attribute']['value'] . '"';
$attribute['Attribute']['timestamp'] = date('Ymd', $attribute['Attribute']['timestamp']);
}
return $attributes;