diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-01-11 20:52:17 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-01-11 20:52:17 +0000 |
| commit | b1ebb7c7850cc84c5f0c6569335008a7d33b80fc (patch) | |
| tree | 6d128e4bc865d78396b748de0e357a8fc62fc8bf | |
| parent | 511cbb1c981d77d3adc21c6de279d7afd5f07e94 (diff) | |
bug 2554 php warning PHPWG_URL is not defined in page_tail.inc.php
git-svn-id: http://piwigo.org/svn/trunk@12875 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions.php | 32 | ||||
| -rw-r--r-- | include/page_tail.php | 2 |
2 files changed, 8 insertions, 26 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 84bae9154..f754f446a 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1564,12 +1564,12 @@ SELECT image_id function pwg_URL() { $urls = array( - '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', + 'HOME' => PHPWG_URL, + 'WIKI' => PHPWG_URL.'/doc', + 'DEMO' => PHPWG_URL.'/demo', + 'FORUM' => PHPWG_URL.'/forum', + 'BUGS' => PHPWG_URL.'/bugs', + 'EXTENSIONS' => PHPWG_URL.'/ext', ); return $urls; } @@ -1969,25 +1969,7 @@ SELECT '.$conf['user_fields']['username'].' } function get_newsletter_subscribe_base_url($language) { - $subscribe_domain = 'piwigo.org'; - - $domain_of = array( - 'fr_FR' => 'fr.piwigo.org', - 'it_IT' => 'it.piwigo.org', - 'de_DE' => 'de.piwigo.org', - 'es_ES' => 'es.piwigo.org', - 'zh_CN' => 'cn.piwigo.org', - 'pl_PL' => 'pl.piwigo.org', - 'hu_HU' => 'hu.piwigo.org', - 'ru_RU' => 'ru.piwigo.org', - 'nl_NL' => 'nl.piwigo.org', - ); - - if (isset($domain_of[$language])) { - $subscribe_domain = $domain_of[$language]; - } - - return 'http://'.$subscribe_domain.'/announcement/subscribe/'; + return PHPWG_URL.'/announcement/subscribe/'; } /** diff --git a/include/page_tail.php b/include/page_tail.php index 93f6219bf..203268c32 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -27,7 +27,7 @@ trigger_action('loc_begin_page_tail'); $template->assign( array( 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', - 'PHPWG_URL' => PHPWG_URL, + 'PHPWG_URL' => defined('PHPWG_URL') ? PHPWG_URL : '', )); //--------------------------------------------------------------------- contact |