From e443648392f843e1504049d44359984f541365e6 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 3 Nov 2010 22:50:46 +0000
Subject: New version 2.1.5 hard coded.

Stable release required modifications: don't show version and generation time in
footer, don't check the upgrade feed, don't die on sql errors.


git-svn-id: http://piwigo.org/svn/tags/2.1.5@7615 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/config_default.inc.php | 8 ++++----
 include/constants.php          | 4 ++--
 tools/create_listing_file.php  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 694785bb8..b47dbbdff 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -156,7 +156,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.
@@ -314,7 +314,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);
@@ -449,7 +449,7 @@ $conf['session_length'] = 3600;
 $conf['show_queries'] = false;
 
 // show_gt : display generation time at the bottom of each page
-$conf['show_gt'] = true;
+$conf['show_gt'] = false;
 
 // debug_l10n : display a warning message each time an unset language key is
 // accessed
@@ -462,7 +462,7 @@ $conf['debug_template'] = false;
 $conf['debug_mail'] = false;
 
 // die_on_sql_error: if an SQL query fails, should everything stop?
-$conf['die_on_sql_error'] = true;
+$conf['die_on_sql_error'] = false;
 
 // if true, some language strings are replaced during template compilation
 // (insted of template output). this results in better performance. however
diff --git a/include/constants.php b/include/constants.php
index 31801be69..2f6523b7e 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // Default settings
-define('PHPWG_VERSION', '2.1');
+define('PHPWG_VERSION', '2.1.5');
 define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
 define('PHPWG_DEFAULT_TEMPLATE', 'Sylvia');
 
@@ -106,4 +106,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 d2f20ba66..00b463f7a 100644
--- a/tools/create_listing_file.php
+++ b/tools/create_listing_file.php
@@ -27,7 +27,7 @@
 
 // ****** Gallery configuration ****** //
 // Script version
-$conf['version'] = '2.1';
+$conf['version'] = '2.1.5';
 
 // URL of main gallery
 // Example : http://www.my.domain/my/directory
-- 
cgit v1.2.3