summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordkm <dkm@gre.kataplop.net>2009-06-09 16:17:22 +0200
committerdkm <dkm@gre.kataplop.net>2009-06-09 16:17:22 +0200
commit2fa9f295ea0e7e323661e0bef9652ed5551d147c (patch)
tree37d393c90042997aabbdd76281a50694cab5069f
parent93acc00959acaa365b0750f4ed8cf1cb2e2caefc (diff)
parent657e17361db19ac1878b2a6d93595a763aef8b15 (diff)
Merge branch 'master' of www.kataplop.net:/var/www/gallery3-marc
-rw-r--r--modules/g2_import/helpers/g2_import.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index b7bee1eb..648f3809 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -37,11 +37,13 @@ class g2_import_Core {
}
$embed_path = module::get_var("g2_import", "embed_path");
+ $multi_path = module::get_var("g2_import", "multi_path");
+
if (empty($embed_path)) {
throw new Exception("@todo G2_IMPORT_NOT_CONFIGURED");
}
- g2_import::$init = g2_import::init_embed($embed_path);
+ g2_import::$init = g2_import::init_embed($embed_path, $multi_path);
}
static function is_valid_embed_path($embed_path, $multi_path) {
@@ -52,7 +54,7 @@ class g2_import_Core {
* Initialize the embedded Gallery2 instance. Call this before any other Gallery2 calls.
*/
static function init_embed($embed_path, $multi_path) {
- if (!is_file($embed_path) || (!empty($multi_path) && !is_dir($multi_path)) {
+ if (!is_file($embed_path) || (!empty($multi_path) && !is_dir($multi_path))) {
return false;
}
@@ -73,7 +75,7 @@ class g2_import_Core {
if (!empty($multi_path))
$config_dir = dirname($multi_path);
else
- $config_dir = $base_dir
+ $config_dir = $base_dir;
file_put_contents(
"$mod_path/embed.php",