bugfix: pagination bar has an empty page at the end

[koha.git] / C4 / Installer.pm

diff --git a/C4/Installer.pm b/C4/Installer.pm
index 1dc13aa..2e1fe1a 100644 (file)
--- a/C4/Installer.pm
+++ b/C4/Installer.pm
@@ -79,6 +79,8 @@ sub new {
                                   $self->{'user'}, $self->{'password'});
     $self->{'language'} = undef;
     $self->{'marcflavour'} = undef;
+       $self->{'dbh'}->do('set NAMES "utf8"');
+    $self->{'dbh'}->{'mysql_enable_utf8'}=1; 
 
     bless $self, $class;
     return $self;
@@ -517,6 +519,7 @@ sub set_version_syspref {
         my $finish=$self->{'dbh'}->prepare("INSERT into systempreferences (variable,value,explanation) values ('Version',?,'The Koha database version. WARNING: Do not change this value manually, it is maintained by the webinstaller')");
         $finish->execute($kohaversion);
     }
+    C4::Context->clear_syspref_cache();
 }
 
 =head2 load_sql
@@ -556,7 +559,7 @@ sub load_sql {
             . ( $self->{user}     ? " -u $self->{user} "     : "" )
             . ( $self->{password} ? " -p'$self->{password}'"   : "" )
             . " $self->{dbname} ";
-        $error = qx($strcmd <$filename 2>&1 1>/dev/null);
+        $error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null);
     } elsif ( $self->{dbms} eq 'Pg' ) {
         $strcmd = "psql "
             . ( $self->{hostname} ? " -h $self->{hostname} " : "" )