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
This commit is contained in:
plegall
2009-03-13 23:43:50 +00:00
parent f94ff8b8e1
commit 87a7b60bed
12 changed files with 34 additions and 32 deletions
+9
View File
@@ -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');