Merge branch 'stable' of gitorious.org:owncloud/owncloud into stable

This commit is contained in:
Klaas Freitag 2011-11-21 17:45:20 +01:00
commit 2a7430158a

View file

@ -313,7 +313,7 @@ class OC_DB {
$query = str_replace( 'now()', self::$DBConnection->now(), $query );
// differences in escaping of table names ('`' for mysql) and getting the current timestamp
if( $type == 'sqlite' || $type == 'sqlite3' ){
if( $CONFIG_DBTYPE == 'sqlite' || $CONFIG_DBTYPE == 'sqlite3' ){
$query = str_replace( '`', '\'', $query );
}
elseif( $CONFIG_DBTYPE == 'pgsql' ){