mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-05 13:39:23 +01:00
fixed warning: implode(): Invalid arguments passed in /var/www/epl-trunk/etemplate/inc/class.bo_merge.inc.php on line 569
This commit is contained in:
parent
ebbbf233cf
commit
6c05070aa0
@ -557,12 +557,12 @@ abstract class bo_merge
|
|||||||
}
|
}
|
||||||
// Look for numbers, set their value if needed
|
// Look for numbers, set their value if needed
|
||||||
$format = $replacement = '';
|
$format = $replacement = '';
|
||||||
if($this->numeric_fields) {
|
if($this->numeric_fields)
|
||||||
|
{
|
||||||
$names = array();
|
$names = array();
|
||||||
foreach($this->numeric_fields as $fieldname) {
|
foreach($this->numeric_fields as $fieldname) {
|
||||||
$names[] = preg_quote($fieldname,'/');
|
$names[] = preg_quote($fieldname,'/');
|
||||||
}
|
}
|
||||||
}
|
|
||||||
switch($mimetype.$mso_application_progid)
|
switch($mimetype.$mso_application_progid)
|
||||||
{
|
{
|
||||||
case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc
|
case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc
|
||||||
@ -574,7 +574,7 @@ abstract class bo_merge
|
|||||||
{
|
{
|
||||||
$content = preg_replace($format, $replacement, $content);
|
$content = preg_replace($format, $replacement, $content);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// replace CRLF with linebreak tag of given type
|
// replace CRLF with linebreak tag of given type
|
||||||
switch($mimetype.$mso_application_progid)
|
switch($mimetype.$mso_application_progid)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user