aboutsummaryrefslogtreecommitdiffstats
path: root/admin/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 /admin/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 'admin/include')
-rw-r--r--admin/include/functions.php17
1 files changed, 5 insertions, 12 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 5fdee9684..6f41aafba 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1741,21 +1741,14 @@ SELECT image_id
*/
function pwg_URL()
{
- global $lang_info;
$urls = array(
- 'WIKI' => 'http://'.PHPWG_DOMAIN.'/doc/',
- 'HOME' => 'http://'.PHPWG_DOMAIN.'/',
- 'DEMO' => 'http://demo.'.PHPWG_DOMAIN.'/',
- 'FORUM' => 'http://forum.'.PHPWG_DOMAIN.'/',
- 'BUGS' => 'http://bugs.'.PHPWG_DOMAIN.'/',
+ 'HOME' => 'http://'.PHPWG_DOMAIN,
+ 'WIKI' => 'http://'.PHPWG_DOMAIN.'/doc',
+ 'DEMO' => 'http://'.PHPWG_DOMAIN.'/demo',
+ 'FORUM' => 'http://'.PHPWG_DOMAIN.'/forum',
+ 'BUGS' => 'http://'.PHPWG_DOMAIN.'/bugs',
'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
);
- if ( isset($lang_info['code']) and
- in_array($lang_info['code'], array('fr','en')) )
- { /* current wiki languages are French or English */
- $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':'.$lang_info['code'];
- $urls['HOME'] .= '?lang='.$lang_info['code'];
- }
return $urls;
}