aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgrum <grum@piwigo.org>2010-10-30 15:07:18 +0000
committergrum <grum@piwigo.org>2010-10-30 15:07:18 +0000
commit462e8aa2fc6d073e75eee6bc416e861e7653e28e (patch)
tree6ccc53c9367cee8d17130a1b6ad56d3f87f032e2 /include
parentd8ec9b9fdd6fb5a29e762ecd95d440f8942ca382 (diff)
Add possibility to configure the url for the extension manager
feature:1966 git-svn-id: http://piwigo.org/svn/trunk@7501 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php12
-rw-r--r--include/config_default.inc.php9
2 files changed, 17 insertions, 4 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index c8182bc5e..71aa78c44 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -133,7 +133,15 @@ else {
define('PHPWG_DOMAIN', 'piwigo.org');
}
define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
-define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
+
+if(isset($conf['alternative_pem_url']) and $conf['alternative_pem_url']!='')
+{
+ define('PEM_URL', $conf['alternative_pem_url']);
+}
+else
+{
+ define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
+}
// language files
@@ -235,4 +243,4 @@ add_event_handler('render_comment_content', 'parse_comment_content');
add_event_handler('render_comment_author', 'strip_tags');
add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1);
trigger_action('init');
-?> \ No newline at end of file
+?>
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index c6361bce0..cab91814b 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -514,7 +514,7 @@ $conf['apache_authentication'] = false;
// piwigo_users table.
$conf['users_table'] = $prefixeTable.'users';
-// If you decide to use external authentication
+// If you decide to use external authentication
// change conf below by $conf['external_authentification'] = true;
$conf['external_authentification'] = false;
@@ -785,4 +785,9 @@ $conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269';
// enable the synchronization method for adding photos
$conf['enable_synchronization'] = true;
-?> \ No newline at end of file
+
+// PEM url
+$conf['alternative_pem_url'] = '';
+
+
+?>