Merged revisions 5264 via svnmerge from

https://svn.webgui.org/plainblack/branch/WebGUI_7.4

........
  r5264 | graham | 2008-01-09 10:59:46 -0600 (Wed, 09 Jan 2008) | 1 line
  
  reverting UTF-8 change
........
This commit is contained in:
Graham Knop 2008-01-09 17:16:20 +00:00
parent d5e81e6cf4
commit 15b22ab4ca
2 changed files with 1 additions and 8 deletions

View file

@ -22,7 +22,6 @@
7.4.20
- fix: Assets with no committed versions may be left as orphans when parent is purged
- fix: Tag cloud limited was to 50 least commonly used tags
- Use UTF8 for database connection when connecting to MySQL
- fix: Calendar Edit template refers to non-existant and other unneeded javascript files
7.4.19

View file

@ -319,13 +319,7 @@ sub connect {
my $pass = shift;
my $params = shift;
my $driver;
if ($dsn =~ /^dbi:(\w+):/i) {
$driver = $1;
}
my $dbh = DBI->connect($dsn,$user,$pass,{RaiseError => 0, AutoCommit => 1,
$driver eq 'mysql' ? (mysql_enable_utf8 => 1) : (),
});
my $dbh = DBI->connect($dsn,$user,$pass,{RaiseError=>0,AutoCommit=>1 });
unless (defined $dbh) {
$session->errorHandler->error("Couldn't connect to database: $dsn");