Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/new/bug_8268'

  • Loading branch information...
commit 913aba1a6639e00535cdb631ed2ca80cbe80289f 2 parents 88e66b6 + 20ad696
@PaulPoulain PaulPoulain authored
Showing with 3 additions and 1 deletion.
  1. +1 −0  rewrite-config.PL
  2. +2 −1  tools/export.pl
View
1  rewrite-config.PL
@@ -101,6 +101,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
"__KOHA_GROUP__" => "koha",
"__ZEBRA_PASS__" => "zebrastripes",
"__ZEBRA_USER__" => "kohauser",
+ '__BACKUP_DIR__' => "$prefix/var/spool",
'__INTRANET_CGI_DIR__' => "$prefix/intranet/cgi-bin",
'__INTRANET_TMPL_DIR__' => "$prefix/intranet/templates",
'__INTRANET_WWW_DIR__' => "$prefix/intranet/www",
View
3  tools/export.pl
@@ -462,7 +462,8 @@ sub download_backup {
my $filename = $args->{filename};
return unless ( $directory && -d $directory );
- return unless ( $filename =~ m/$extension(\.(gz|bz2|xz))?$/ && not $filename =~ m#|# );
+ return unless ( $filename =~ m/\.$extension(\.(gz|bz2|xz))?$/ );
+ return if ( $filename =~ m#/# );
$filename = "$directory/$filename";
return unless ( -f $filename && -r $filename );
return unless ( open(my $dump, '<', $filename) );
Please sign in to comment.
Something went wrong with that request. Please try again.