From 92cd7f34b07e86062f2c024039e3309768b48ce6 Mon Sep 17 00:00:00 2001
From: Andy Wermke <andy@dev.next-step-software.com>
Date: Thu, 04 Apr 2013 10:10:23 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/roundcube/roundcubemail
---
plugins/database_attachments/database_attachments.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 079f4e5..2511dbb 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -46,7 +46,7 @@
$data = base64_encode($data);
$status = $rcmail->db->query(
- "INSERT INTO ".get_table_name('cache')
+ "INSERT INTO ".$rcmail->db->table_name('cache')
." (created, user_id, cache_key, data)"
." VALUES (".$rcmail->db->now().", ?, ?, ?)",
$_SESSION['user_id'],
@@ -82,7 +82,7 @@
$data = base64_encode($args['data']);
$status = $rcmail->db->query(
- "INSERT INTO ".get_table_name('cache')
+ "INSERT INTO ".$rcmail->db->table_name('cache')
." (created, user_id, cache_key, data)"
." VALUES (".$rcmail->db->now().", ?, ?, ?)",
$_SESSION['user_id'],
@@ -106,7 +106,7 @@
$args['status'] = false;
$rcmail = rcmail::get_instance();
$status = $rcmail->db->query(
- "DELETE FROM ".get_table_name('cache')
+ "DELETE FROM ".$rcmail->db->table_name('cache')
." WHERE user_id = ?"
." AND cache_key = ?",
$_SESSION['user_id'],
@@ -139,7 +139,7 @@
$sql_result = $rcmail->db->query(
"SELECT data"
- ." FROM ".get_table_name('cache')
+ ." FROM ".$rcmail->db->table_name('cache')
." WHERE user_id=?"
." AND cache_key=?",
$_SESSION['user_id'],
@@ -161,7 +161,7 @@
$prefix = $this->cache_prefix . $args['group'];
$rcmail = rcmail::get_instance();
$rcmail->db->query(
- "DELETE FROM ".get_table_name('cache')
+ "DELETE FROM ".$rcmail->db->table_name('cache')
." WHERE user_id = ?"
." AND cache_key LIKE '{$prefix}%'",
$_SESSION['user_id']);
--
Gitblit v1.9.1