aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/dblayer/functions_mysql.inc.php8
-rw-r--r--include/functions.inc.php2
-rw-r--r--include/functions_user.inc.php5
-rw-r--r--themes/default/template/index.tpl2
4 files changed, 4 insertions, 13 deletions
diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php
index 7faf4c70a..9849ca3e9 100644
--- a/include/dblayer/functions_mysql.inc.php
+++ b/include/dblayer/functions_mysql.inc.php
@@ -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 = '
diff --git a/include/functions.inc.php b/include/functions.inc.php
index b28a04d3d..4b276b662 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -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.'
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 225386f6a..2d3279e1a 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -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);
-
}
}
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index eaa1b3554..d320f4d7b 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -50,7 +50,7 @@
{/if}
{if isset($U_MODE_POSTED)}
<li>{strip}<a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
- <span class="pwg-icon pwg-icon-camera-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span>
+ <span class="pwg-icon pwg-icon-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span>
</a>{/strip}</li>
{/if}
{if isset($U_MODE_CREATED)}