archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- fix icon display on index page (calendar by post date)

Browse source 
- remove unnecessary include_once
- mysql functions simplification

git-svn-id: http://piwigo.org/svn/trunk@8844 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2011-01-22 21:12:48 +00:00
commit 13b9118f41
4 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/dblayer/functions_mysql.inc.php
View file

@ -77,9 +77,7 @@ function pwg_db_check_version()
function pwg_get_db_version()
{
list($mysql_version) = pwg_db_fetch_row(pwg_query('SELECT VERSION();'));
return $mysql_version;
return mysql_get_server_info();
}
function pwg_query($query)
@ -222,8 +220,8 @@ function mass_updates($tablename, $dbfields, $datas, $flags=0)
if (count($datas) == 0)
return;
// depending on the MySQL version, we use the multi table update or N update queries
if (count($datas) < 10 or version_compare(mysql_get_server_info(), '4.0.4') < 0)
{ // MySQL is prior to version 4.0.4, multi table update feature is not available
if (count($datas) < 10)
{
foreach ($datas as $data)
{
$query = '

2
include/functions.inc.php
View file

@ -813,8 +813,6 @@ function fill_caddie($elements_id)
{
global $user;
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
$query = '
SELECT element_id
FROM '.CADDIE_TABLE.'

5
include/functions_user.inc.php
View file

@ -154,7 +154,6 @@ SELECT MAX('.$conf['user_fields']['id'].') + 1
$conf['user_fields']['email'] => $mail_address
);
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts(USERS_TABLE, array_keys($insert), array($insert));
// Assign by default groups
@ -184,7 +183,6 @@ SELECT id
if (count($inserts) != 0)
{
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts(USER_GROUP_TABLE, array('user_id', 'group_id'), $inserts);
}
@ -417,7 +415,6 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
WHERE user_id = '.$userdata['id'];
pwg_query($query);
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts
(
USER_CACHE_CATEGORIES_TABLE,
@ -1022,9 +1019,7 @@ function create_user_infos($arg_id, $override_values = null)
array_push($inserts, $insert);
}
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts(USER_INFOS_TABLE, array_keys($inserts[0]), $inserts);
}
}