From f662cedc035359d5fc167a7bba14c9e93872833d Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 16 Oct 2008 19:53:52 +0000
Subject: merge -c2459 from release 1.7.2

New version 1.7.3 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/release-1_7_3@2764 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/config_default.inc.php | 8 ++++----
 include/constants.php          | 2 +-
 tools/create_listing_file.php  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index f25445c73..a215607d0 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -153,7 +153,7 @@ $conf['tn_height'] = 128;
 
 // show_version : shall the version of PhpWebGallery be displayed at the
 // bottom of each page ?
-$conf['show_version'] = true;
+$conf['show_version'] = false;
 
 
 // links : list of external links to add in the menu. An example is the best
@@ -294,7 +294,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);
@@ -416,14 +416,14 @@ $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
 $conf['debug_l10n'] = 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;
 
 // +-----------------------------------------------------------------------+
 // |                            authentication                             |
diff --git a/include/constants.php b/include/constants.php
index 5c4577dd3..64fc1cfb6 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -25,7 +25,7 @@
 // +-----------------------------------------------------------------------+
 
 // Default settings
-define('PHPWG_VERSION', 'branch 1.7');
+define('PHPWG_VERSION', '1.7.3');
 define('PHPWG_DOMAIN', 'phpwebgallery.net');
 define('PHPWG_URL', 'http://www.'.PHPWG_DOMAIN);
 define('PHPWG_DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php
index 2500973ef..564b9cd0d 100644
--- a/tools/create_listing_file.php
+++ b/tools/create_listing_file.php
@@ -31,7 +31,7 @@
 
 // ****** Gallery configuration ****** //
 // Script version
-$conf['version'] = 'branch 1.7';
+$conf['version'] = '1.7.3';
 
 // URL of main gallery
 // Example : http://www.my.domain/my/directory
-- 
cgit v1.2.3