From d72e8256a12dad482eff85ce572943cc378bdd0c Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 8 Mar 2016 15:31:07 +0100
Subject: change default configuration settings for a stable branch. Developers
 who need previous configuration settings can modify them in their local
 configuration

git cherry-pick 39d3c6883b181317205b2b3e31c20baf116ac3b2
---
 include/config_default.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index f66dab486..91d620edb 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -121,7 +121,7 @@ $conf['paginate_pages_around'] = 2;
 
 // 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.
@@ -238,7 +238,7 @@ $conf['available_permission_levels'] = array(0,1,2,4,8);
 //
 // 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);
@@ -430,7 +430,7 @@ $conf['session_use_ip_address'] = true;
 $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
@@ -443,7 +443,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
 // (instead of template output). this results in better performance. however
-- 
cgit v1.2.3


From 507c932db914d7b50f05ca10e626b0da3fff0a68 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 8 Mar 2016 15:32:30 +0100
Subject: next version is 2.8.0

---
 include/constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/constants.php b/include/constants.php
index ab7c067c3..347389dc8 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // Default settings
-define('PHPWG_VERSION', '2.8.0RC2');
+define('PHPWG_VERSION', '2.8.0');
 define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
 define('PHPWG_DEFAULT_TEMPLATE', 'elegant');
 
-- 
cgit v1.2.3