Changeset 3197 for trunk/include

Timestamp:

Mar 14, 2009, 12:43:50 AM (15 years ago)

Author:

plg

Message:

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.

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• constants.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -126 +126 @@
 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

trunk/include/constants.php

@@ -24 +24 @@
 // 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');