projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restores $plugin_dir as the main plugin location. Tries to prevent possible name...
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 5d2d6e6da1d07c8e50ccc3d2684e1a2763755a60..e57ab4bd01bad5ce1fa117a1dc7f9b4d4bd1fbf3 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-48,17
+48,18
@@
$show_future_entries = 0;
# --- Plugins (Optional) -----
# File listing plugins blosxom should load
# --- Plugins (Optional) -----
# File listing plugins blosxom should load
-# (if empty blosxom will load all plugins in $plugin_path directories)
+# (if empty blosxom will load all plugins in $plugin_
dir and $plugin_
path directories)
$plugin_list = "";
# Where are my plugins kept?
$plugin_list = "";
# Where are my plugins kept?
-# List of directories, separated by ';' on windows, ':' everywhere else
-$plugin_path = "";
+$plugin_dir = "";
# Where should my plugins keep their state information?
# Where should my plugins keep their state information?
-$plugin_state_dir = "";
+$plugin_state_dir = "
$plugin_dir/state
";
-#$plugin_state_dir = "/var/lib/blosxom/state";
+# Additional plugins location
+# List of directories, separated by ';' on windows, ':' everywhere else
+$plugin_path = "";
# --- Static Rendering -----
# --- Static Rendering -----
@@
-244,7
+245,8
@@
while (<DATA>) {
# Plugins: Start
my $path_sep = $^O eq 'MSWin32' ? ';' : ':';
# Plugins: Start
my $path_sep = $^O eq 'MSWin32' ? ';' : ':';
-my @plugin_dirs = split /$path_sep/, ( $plugin_path || $plugin_dir );
+my @plugin_dirs = split /$path_sep/, $plugin_path;
+unshift @plugin_dirs, $plugin_dir;
my @plugin_list = ();
my %plugin_hash = ();
my @plugin_list = ();
my %plugin_hash = ();
@@
-291,8
+293,10
@@
foreach my $plugin (@plugin_list) {
# For Blosxom::Plugin::Foo style plugins, we need to use a string require
eval "require $plugin_name";
}
# For Blosxom::Plugin::Foo style plugins, we need to use a string require
eval "require $plugin_name";
}
- else {
- eval { require $plugin };
+ else
+ { # we try first to load from $plugin_dir before attempting from $plugin_path
+ eval { require "$plugin_dir/$plugin" }
+ or eval { require $plugin };
}
if ($@) {
}
if ($@) {