aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-02-12 23:20:40 +0000
committerplegall <plg@piwigo.org>2009-02-12 23:20:40 +0000
commit51fe601ee9b9dda48bd0ca91fd78ab15586181ec (patch)
treef160800bdf2e46e9fda666e80a878a351d2b5976 /include
parent612c9906fbfcec66ba0e2690de1785488c186150 (diff)
merge r3132 from branch 2.0 to trunk
modification: phpwebgallery.net moves to piwigo.org modification: doc/README_*.txt much simpler with link to piwigo.org for installation and upgrade guides. modification: latest_version has changed its path on the website to download directory. deletion: doc/ChangeLog was useless and outdated. git-svn-id: http://piwigo.org/svn/trunk@3133 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/config_default.inc.php9
-rw-r--r--include/constants.php6
2 files changed, 7 insertions, 8 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 0ef4811f8..c0f889808 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -165,8 +165,7 @@ $conf['meta_ref'] = true;
// for each link is associated a label
// $conf['links'] = array(
// 'http://piwigo.org' => 'PWG website',
-// 'http://forum.phpwebgallery.net' => 'PWG forum',
-// 'http://phpwebgallery.net/doc' => 'PWG wiki'
+// 'http://piwigo.org/forum' => 'PWG forum',
// );
//
// Advenced use:
@@ -174,9 +173,9 @@ $conf['meta_ref'] = true;
// you can pass a array with different optional parameter values
// $conf['links'] = array(
// 'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'),
-// 'http://forum.phpwebgallery.net' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
-// 'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'),
-// 'http://download.gna.org/phpwebgallery/' =>
+// 'http://piwigo.org/forum' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
+// 'http://piwigo.org/ext' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'),
+// 'http://piwigo.org/downloads' =>
// array('label' => 'PopUp', 'new_window' => true,
// 'nw_name' => 'PopUp', 'nw_features' => 'width=800,height=450,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'),
// );
diff --git a/include/constants.php b/include/constants.php
index 98ee75aa0..21abf49b7 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -23,9 +23,9 @@
// Default settings
define('PHPWG_VERSION', 'Colibri');
-define('PHPWG_DOMAIN', 'phpwebgallery.net');
-define('PHPWG_URL', 'http://www.'.PHPWG_DOMAIN);
-define('PEM_URL', 'http://' . PHPWG_DOMAIN . '/ext_new'); /* need to be changed on final release */
+define('PHPWG_DOMAIN', 'piwigo.org');
+define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
+define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
define('PHPWG_DEFAULT_TEMPLATE', 'yoga/Sylvia');