aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-02-08 22:04:36 +0000
committerrub <rub@piwigo.org>2007-02-08 22:04:36 +0000
commit5b038de71715c8ec006abffe9d23c4172b71d0ba (patch)
tree8ca826e68a35ea386b3831cf30a0fb1eb9632efe /admin
parent1f53608976250806d9a37f93e386f53a84aedbbc (diff)
Issue 0000639: Force selected page on index.php
Continue the Radu idea, restrict more use of random list Issue 0000598: NBM: Add new informations Add css on mail Use user template for mail (on next commit, best control) Comment mass_inserts because don't with MySQL 4.1.9 git-svn-id: http://piwigo.org/svn/trunk@1792 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php9
-rw-r--r--admin/include/functions_notification_by_mail.inc.php2
2 files changed, 8 insertions, 3 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 7bc9cf5e6..81b3cde8e 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -525,10 +525,13 @@ function mass_inserts($table_name, $dbfields, $datas)
{
$first = true;
- $query = 'SHOW VARIABLES where variable_name = \'max_allowed_packet\';';
+ /*$query = 'SHOW VARIABLES where variable_name = \'max_allowed_packet\';';
list(, $packet_size) = mysql_fetch_row(pwg_query($query));
- $packet_size = $packet_size - 2000; // The last list of values MUST not exceed 2000 character
-
+ $packet_size = $packet_size - 2000; // The last list of values MUST not exceed 2000 character*/
+ /* DON T WORK WITH MySQL 4.1.9 */
+ $packet_size = 1000000;
+ $query = '';
+
foreach ($datas as $insert)
{
if (strlen($query) >= $packet_size)
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index 89a69206c..44f1afdb9 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -265,6 +265,8 @@ function set_user_on_env_nbm($user_id, $is_action_send)
$user['id'] = $user_id;
$user = array_merge($user, getuserdata($user['id'], true));
+ list($user['template'], $user['theme']) = explode('/', $user['template']);
+
if ($env_nbm['last_language'] != $user['language'])
{
$env_nbm['last_language'] = $user['language'];