Highslide: Fix page jumps when closing thumbnails

[gallery.git] / gal

diff --git a/gal b/gal
index f16a5f746fb7c5bfe2a24468740c4383f57f4b49..c62d0d86385dbd494d7a27294be72a0603b7e65b 100755 (executable)
--- a/gal
+++ b/gal
@@ -1,9 +1,8 @@
 #!/usr/bin/perl
 # UCW Gallery -- Master Program
 #!/usr/bin/perl
 # UCW Gallery -- Master Program

-# (c) 2012 Martin Mares <mj@ucw.cz>
+# (c) 2012--2015 Martin Mares <mj@ucw.cz>

 
 

-use strict;
-use warnings;
+use common::sense;

 use Getopt::Long;
 
 use FindBin;
 use Getopt::Long;
 
 use FindBin;


@@ -37,7 +36,7 @@ Getopt::Long::Configure('require_order', 'bundling');
 GetOptions(
        "help" => \&show_help,
        "version" => sub {
 GetOptions(
        "help" => \&show_help,
        "version" => sub {

-                       print "UCW Gallery 2.0 (c) 2004-2012 Martin Mares <mj\@ucw.cz>\n";
+                       print "UCW Gallery 2.1 (c) 2004-2015 Martin Mares <mj\@ucw.cz>\n";

                },
        "all!" => \$all,
        "p|parallel=i" => \$parallel,
                },
        "all!" => \$all,
        "p|parallel=i" => \$parallel,


@@ -54,7 +53,7 @@ my $sub_path = "$gallery_root/bin/gal-$sub";
 -x $sub_path or die "Unknown subcommand $sub\n";
 
 $ENV{"GALLERY_ROOT"} = $gallery_root;
 -x $sub_path or die "Unknown subcommand $sub\n";
 
 $ENV{"GALLERY_ROOT"} = $gallery_root;

-$ENV{"PERL5LIB"} = join(":", $gallery_root, $ENV{"PERL5LIB"} // ());
+$ENV{"PERL5LIB"} = join(":", $gallery_root . "/lib", $ENV{"PERL5LIB"} // ());

 
 if (!$all) {
        exec $sub_path, @ARGV;
 
 if (!$all) {
        exec $sub_path, @ARGV;