diff options
| author | plegall <plg@piwigo.org> | 2009-03-13 23:43:50 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2009-03-13 23:43:50 +0000 |
| commit | 87a7b60bed82775a58c2706e9441cbe428cbc393 (patch) | |
| tree | 5874f9b424cfab205ae810baa7a4fe85735bdfc3 /admin | |
| parent | f94ff8b8e180526899e17db9f4732ff82a4a876b (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-- | admin/include/functions.php | 17 | ||||
| -rw-r--r-- | admin/intro.php | 1 | ||||
| -rw-r--r-- | admin/template/goto/footer.tpl | 2 | ||||
| -rw-r--r-- | admin/template/goto/intro.tpl | 2 |
4 files changed, 8 insertions, 14 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; } diff --git a/admin/intro.php b/admin/intro.php index 9d37a1b30..98ee92f26 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -182,6 +182,7 @@ list($nb_comments) = mysql_fetch_row(pwg_query($query)); $template->assign( array( + 'PHPWG_URL' => PHPWG_URL, 'PWG_VERSION' => PHPWG_VERSION, 'OS' => PHP_OS, 'PHP_VERSION' => phpversion(), diff --git a/admin/template/goto/footer.tpl b/admin/template/goto/footer.tpl index 9e0dcd85d..8c12ca190 100644 --- a/admin/template/goto/footer.tpl +++ b/admin/template/goto/footer.tpl @@ -15,7 +15,7 @@ *} {'powered_by'|@translate} - <a href="http://piwigo.org" class="Piwigo"> + <a href="{$PHPWG_URL}" class="Piwigo"> <span class="Piwigo">Piwigo</span></a> {$VERSION} {if isset($CONTACT_MAIL)} diff --git a/admin/template/goto/intro.tpl b/admin/template/goto/intro.tpl index d9cafde2a..1c76169b8 100644 --- a/admin/template/goto/intro.tpl +++ b/admin/template/goto/intro.tpl @@ -4,7 +4,7 @@ <dt>{'Piwigo version'|@translate}</dt> <dd> <ul> - <li><a href="http://piwigo.org" onclick="window.open(this.href, ''); + <li><a href="{$PHPWG_URL}" onclick="window.open(this.href, ''); return false;">Piwigo</a> {$PWG_VERSION}</li> <li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li> </ul> |