Changeset 12875


Ignore:
Timestamp:
Jan 11, 2012, 9:52:17 PM (8 years ago)
Author:
rvelices
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions.php

    r12865 r12875  
    15651565{
    15661566  $urls = array(
    1567     'HOME'       => 'http://'.PHPWG_DOMAIN,
    1568     'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc',
    1569     'DEMO'       => 'http://'.PHPWG_DOMAIN.'/demo',
    1570     'FORUM'      => 'http://'.PHPWG_DOMAIN.'/forum',
    1571     'BUGS'       => 'http://'.PHPWG_DOMAIN.'/bugs',
    1572     'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
     1567    'HOME'       => PHPWG_URL,
     1568    'WIKI'       => PHPWG_URL.'/doc',
     1569    'DEMO'       => PHPWG_URL.'/demo',
     1570    'FORUM'      => PHPWG_URL.'/forum',
     1571    'BUGS'       => PHPWG_URL.'/bugs',
     1572    'EXTENSIONS' => PHPWG_URL.'/ext',
    15731573    );
    15741574  return $urls;
     
    19701970
    19711971function get_newsletter_subscribe_base_url($language) {
    1972   $subscribe_domain = 'piwigo.org';
    1973 
    1974   $domain_of = array(
    1975     'fr_FR' => 'fr.piwigo.org',
    1976     'it_IT' => 'it.piwigo.org',
    1977     'de_DE' => 'de.piwigo.org',
    1978     'es_ES' => 'es.piwigo.org',
    1979     'zh_CN' => 'cn.piwigo.org',
    1980     'pl_PL' => 'pl.piwigo.org',
    1981     'hu_HU' => 'hu.piwigo.org',
    1982     'ru_RU' => 'ru.piwigo.org',
    1983         'nl_NL' => 'nl.piwigo.org',
    1984     );
    1985 
    1986   if (isset($domain_of[$language])) {
    1987     $subscribe_domain = $domain_of[$language];
    1988   }
    1989 
    1990   return 'http://'.$subscribe_domain.'/announcement/subscribe/';
     1972  return PHPWG_URL.'/announcement/subscribe/';
    19911973}
    19921974
  • trunk/include/page_tail.php

    r8728 r12875  
    2828  array(
    2929    'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
    30     'PHPWG_URL' => PHPWG_URL,
     30    'PHPWG_URL' => defined('PHPWG_URL') ? PHPWG_URL : '',
    3131    ));
    3232
Note: See TracChangeset for help on using the changeset viewer.