aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-03-13 23:43:50 +0000
committerplegall <plg@piwigo.org>2009-03-13 23:43:50 +0000
commit87a7b60bed82775a58c2706e9441cbe428cbc393 (patch)
tree5874f9b424cfab205ae810baa7a4fe85735bdfc3 /include
parentf94ff8b8e180526899e17db9f4732ff82a4a876b (diff)
merge r3196 from branch 2.0 to trunk
bug 926 fixed: change links to piwigo.org so that they go to existing URLs. new: if the current language is french, the links go to fr.piwigo.org instead. git-svn-id: http://piwigo.org/svn/trunk@3197 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php9
-rw-r--r--include/constants.php3
2 files changed, 9 insertions, 3 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 76054153a..1ca54e1bb 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -125,6 +125,15 @@ load_plugins();
include(PHPWG_ROOT_PATH.'include/user.inc.php');
+if ('fr_FR' == $user['language']) {
+ define('PHPWG_DOMAIN', 'fr.piwigo.org');
+}
+else {
+ define('PHPWG_DOMAIN', 'piwigo.org');
+}
+define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
+define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
+
// language files
load_language('common.lang');
diff --git a/include/constants.php b/include/constants.php
index 21abf49b7..7e429a91c 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -23,9 +23,6 @@
// Default settings
define('PHPWG_VERSION', 'Colibri');
-define('PHPWG_DOMAIN', 'piwigo.org');
-define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
-define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
define('PHPWG_DEFAULT_TEMPLATE', 'yoga/Sylvia');