From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 9 Feb 2011 13:33:36 +0000 (+0100)
Subject: Merge remote branch 'refs/remotes/kirana/after-262'
X-Git-Tag: release-2.6.3~61^2~9^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5536f72295081df4c6b227855cfa22745fcc6039?ds=inline;hp=-c

Merge remote branch 'refs/remotes/kirana/after-262'
---

5536f72295081df4c6b227855cfa22745fcc6039
diff --combined SL/Form.pm
index efcad4ad8,bd16b4c30..6e7145f20
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -385,7 -385,7 +385,7 @@@ sub escape 
    my ($self, $str) = @_;
  
    $str =  Encode::encode('utf-8-strict', $str) if $::locale->is_utf8;
 -  $str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge;
 +  $str =~ s/([^a-zA-Z0-9_.:-])/sprintf("%%%02x", ord($1))/ge;
  
    $main::lxdebug->leave_sub(2);
  
@@@ -401,7 -401,6 +401,7 @@@ sub unescape 
    $str =~ s/\\$//;
  
    $str =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg;
 +  $str =  Encode::decode('utf-8-strict', $str) if $::locale->is_utf8;
  
    $main::lxdebug->leave_sub(2);
  
@@@ -1617,7 -1616,7 +1617,7 @@@ sub get_standard_dbh 
      undef $standard_dbh;
    }
  
-   $standard_dbh ||= SL::DB::create->dbh;
+   $standard_dbh ||= $self->dbconnect_noauto($myconfig);
  
    $main::lxdebug->leave_sub(2);