mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 19:59:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug 2554 php warning PHPWG_URL is not defined in page_tail.inc.php

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@12875 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-01-11 20:52:17 +00:00
parent 511cbb1c98
commit b1ebb7c785
2 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
admin/include/functions.php
View file

@ -1564,12 +1564,12 @@ SELECT image_id
function pwg_URL() function pwg_URL()
{ {
$urls = array( $urls = array(
'HOME' => 'http://'.PHPWG_DOMAIN, 'HOME' => PHPWG_URL,
'WIKI' => 'http://'.PHPWG_DOMAIN.'/doc', 'WIKI' => PHPWG_URL.'/doc',
'DEMO' => 'http://'.PHPWG_DOMAIN.'/demo', 'DEMO' => PHPWG_URL.'/demo',
'FORUM' => 'http://'.PHPWG_DOMAIN.'/forum', 'FORUM' => PHPWG_URL.'/forum',
'BUGS' => 'http://'.PHPWG_DOMAIN.'/bugs', 'BUGS' => PHPWG_URL.'/bugs',
'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext', 'EXTENSIONS' => PHPWG_URL.'/ext',
); );
return $urls; return $urls;
} }
@ -1969,25 +1969,7 @@ SELECT '.$conf['user_fields']['username'].'
} }
function get_newsletter_subscribe_base_url($language) { function get_newsletter_subscribe_base_url($language) {
$subscribe_domain = 'piwigo.org'; return PHPWG_URL.'/announcement/subscribe/';
$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/';
} }
/** /**

2
include/page_tail.php
View file

@ -27,7 +27,7 @@ trigger_action('loc_begin_page_tail');
$template->assign( $template->assign(
array( array(
'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
'PHPWG_URL' => PHPWG_URL, 'PHPWG_URL' => defined('PHPWG_URL') ? PHPWG_URL : '',
)); ));
//--------------------------------------------------------------------- contact //--------------------------------------------------------------------- contact