diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm index 46773f8ac..816147cf7 100644 --- a/lib/WebGUI/AssetClipboard.pm +++ b/lib/WebGUI/AssetClipboard.pm @@ -50,8 +50,8 @@ sub cut { my $self = shift; return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage")); $self->session->db->beginTransaction; - $self->session->db->write("update asset set state='clipboard-limbo' where lineage like ".$self->session->db->quote($self->get("lineage").'%')." and state='published'"); - $self->session->db->write("update asset set state='clipboard', stateChangedBy=".$self->session->db->quote($self->session->user->userId).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId)); + $self->session->db->write("update asset set state='clipboard-limbo' where lineage like ? and state='published'",[$self->get("lineage").'%']); + $self->session->db->write("update asset set state='clipboard', stateChangedBy=?, stateChanged=? where assetId=?", [$self->session->user->userId, $self->session->datetime->time(), $self->getId]); $self->session->db->commit; $self->updateHistory("cut"); $self->{_properties}{state} = "clipboard"; diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm index f90f4cf1c..ff8d8cc31 100644 --- a/lib/WebGUI/SQL.pm +++ b/lib/WebGUI/SQL.pm @@ -322,7 +322,7 @@ sub connect { $session->errorHandler->fatal("Couldn't connect to database."); } - if ( $dsn =~ /Oracle/ ) { # Set Oracle specific attributes + if ( $dsn =~ /Oracle/ || $dsn =~ /ODBC/ ) { # Set specific attributes for long Oracle and ODBC DSNs $dbh->{LongReadLen} = 512 * 1024; $dbh->{LongTruncOk} = 1; }