Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-02-07 11:50:06 +01:00
commit f86368767c

View File

@ -302,9 +302,9 @@ class ExportOds extends ExportPlugin
. htmlspecialchars($row[$j])
. '</text:p>'
. '</table:table-cell>';
} elseif ($fields_meta[$j]->numeric
} elseif (($fields_meta[$j]->numeric
&& $fields_meta[$j]->type != 'timestamp'
&& ! $fields_meta[$j]->blob
&& ! $fields_meta[$j]->blob) || $fields_meta[$j]->type == 'real'
) {
$GLOBALS['ods_buffer'] .=
'<table:table-cell office:value-type="float"'
@ -331,4 +331,4 @@ class ExportOds extends ExportPlugin
return true;
}
}
?>
?>