aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-02-03 11:28:34 +0000
committerplegall <plg@piwigo.org>2011-02-03 11:28:34 +0000
commit380d9ccc21091d6f272460104ee4afe1b92dc89c (patch)
treea0704692038d74a97f8a0b0b6de21416264ffb19
parent1dc5c7ccfdba5f6177eeb7b9a5d10e9135ffabe8 (diff)
bug 1684 fixed: the fix for bug:1683 was an "automatic repair" but it adds
useless code. We couldn't create a migration task on the stable branch, but on trunk this is possible. git-svn-id: http://piwigo.org/svn/trunk@9074 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_user.inc.php41
-rw-r--r--install/db/97-database.php63
2 files changed, 63 insertions, 41 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 2d3279e1a..cc8562323 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -812,47 +812,6 @@ function get_default_user_info($convert_str = true)
unset($cache['default_user']['user_id']);
unset($cache['default_user']['status']);
unset($cache['default_user']['registration_date']);
-
- // theme and language fields may be null in the database (see
- // bug:1683) This is absolutely not nice to have this code in this
- // very place, but it avoids a complexe upgrade with an "automatic
- // fix" in the database => this code should be removed after branch
- // 2.1 if a migration tasks performs the job the same way
- if (empty($cache['default_user']['theme']))
- {
- mass_updates(
- USER_INFOS_TABLE,
- array(
- 'primary' => array('user_id'),
- 'update' => array('theme')
- ),
- array(
- array(
- 'user_id' => $conf['default_user_id'],
- 'theme' => PHPWG_DEFAULT_TEMPLATE
- )
- )
- );
- $cache['default_user']['theme'] = PHPWG_DEFAULT_TEMPLATE;
- }
-
- if (empty($cache['default_user']['language']))
- {
- mass_updates(
- USER_INFOS_TABLE,
- array(
- 'primary' => array('user_id'),
- 'update' => array('language')
- ),
- array(
- array(
- 'user_id' => $conf['default_user_id'],
- 'language' => PHPWG_DEFAULT_LANGUAGE
- )
- )
- );
- $cache['default_user']['language'] = PHPWG_DEFAULT_LANGUAGE;
- }
}
}
diff --git a/install/db/97-database.php b/install/db/97-database.php
new file mode 100644
index 000000000..354fa8a0e
--- /dev/null
+++ b/install/db/97-database.php
@@ -0,0 +1,63 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+$upgrade_description = 'makes sure default user has a theme and a language';
+
+$query = '
+SELECT
+ theme,
+ language
+ FROM '.USER_INFOS_TABLE.'
+ WHERE user_id = '.$conf['default_user_id'].'
+;';
+$result = pwg_query($query);
+list($theme, $language) = pwg_db_fetch_row($result);
+
+$data = array(
+ 'user_id' => $conf['default_user_id'],
+ 'theme' => empty($theme) ? 'Sylvia' : $theme,
+ 'language' => empty($language) ? 'en_UK' : $language,
+ );
+
+mass_updates(
+ USER_INFOS_TABLE,
+ array(
+ 'primary' => array('user_id'),
+ 'update' => array('theme', 'language')
+ ),
+ array(
+ $data
+ )
+ );
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?> \ No newline at end of file