aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-01-20 20:48:42 +0000
committerplegall <plg@piwigo.org>2011-01-20 20:48:42 +0000
commit8659a16b3ef48f1105be70e5d5116a8c47d05c77 (patch)
treeafe8268090bdd6bf8d8f1b444a5c72f1fafa8736
parent0d27a2dd74015a4f4bfc9f57ce355d674fac5c0d (diff)
release number 2.2.0RC1 hard coded + turn off show_gt and check_uprgade_feed2.2.0RC1
git-svn-id: http://piwigo.org/svn/tags/2.2.0RC1@8816 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/config_default.inc.php4
-rw-r--r--include/constants.php4
-rw-r--r--tools/create_listing_file.php2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index b2cb57e98..37d53b097 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -152,7 +152,7 @@ $conf['tn_compression_level'] = 75;
// show_version : shall the version of Piwigo be displayed at the
// bottom of each page ?
-$conf['show_version'] = true;
+$conf['show_version'] = false;
// meta_ref to reference multiple sets of incorporated pages or elements
// Set it false to avoid referencing in google, and other search engines.
@@ -310,7 +310,7 @@ $conf['smtp_password'] = '';
//
// This configuration parameter is set to true in BSF branch and to false
// elsewhere.
-$conf['check_upgrade_feed'] = true;
+$conf['check_upgrade_feed'] = false;
// rate_items: available rates for a picture
$conf['rate_items'] = array(0,1,2,3,4,5);
diff --git a/include/constants.php b/include/constants.php
index e84a73000..87adf7e0a 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -22,7 +22,7 @@
// +-----------------------------------------------------------------------+
// Default settings
-define('PHPWG_VERSION', 'Colibri');
+define('PHPWG_VERSION', '2.2.0RC1');
define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
define('PHPWG_DEFAULT_TEMPLATE', 'Sylvia');
@@ -105,4 +105,4 @@ if (!defined('THEMES_TABLE'))
if (!defined('LANGUAGES_TABLE'))
define('LANGUAGES_TABLE', $prefixeTable.'languages');
-?> \ No newline at end of file
+?>
diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php
index f639fca0a..f005042bf 100644
--- a/tools/create_listing_file.php
+++ b/tools/create_listing_file.php
@@ -27,7 +27,7 @@
// ****** Gallery configuration ****** //
// Script version
-$conf['version'] = 'Colibri';
+$conf['version'] = '2.2.0RC1';
// URL of main gallery
// Example : http://www.my.domain/my/directory