gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Paul Poulain 2012-08-28 18:03:34 +02:00
parent 88e66b674e 20ad69646f
commit 913aba1a66
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rewrite-config.PL
View File

@ -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",

3
tools/export.pl
View File

@ -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) );