summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-05 21:48:16 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-05 21:48:16 +0100
commitdb8a70bbcb941fde96a0ac98919702c49814d0c5 (patch)
tree40a08fb4261c4e4aecb03f96441fcbae04b29e99
parent5f0f6b7c843596a05fb311e4636959ea71e7aaac (diff)
fixup! Support database table prefixes
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/models/mmultipaste.php12
-rw-r--r--application/service/files.php2
2 files changed, 7 insertions, 7 deletions
diff --git a/application/models/mmultipaste.php b/application/models/mmultipaste.php
index 2b0196531..9be4dc416 100644
--- a/application/models/mmultipaste.php
+++ b/application/models/mmultipaste.php
@@ -65,7 +65,7 @@ class Mmultipaste extends CI_Model {
$sql = '
SELECT multipaste.url_id
- FROM multipaste
+ FROM '.$this->db->dbprefix.'multipaste
WHERE multipaste.url_id = ?
LIMIT 1';
$query = $this->db->query($sql, array($id));
@@ -113,7 +113,7 @@ class Mmultipaste extends CI_Model {
{
return $this->db->query("
SELECT user_id
- FROM multipaste
+ FROM ".$this->db->dbprefix."multipaste
WHERE url_id = ?
", array($id))->row_array()["user_id"];
}
@@ -122,7 +122,7 @@ class Mmultipaste extends CI_Model {
{
return $this->db->query("
SELECT url_id, user_id, date
- FROM multipaste
+ FROM ".$this->db->dbprefix."multipaste
WHERE url_id = ?
", array($id))->row_array();
}
@@ -133,8 +133,8 @@ class Mmultipaste extends CI_Model {
$query = $this->db->query("
SELECT mfm.file_url_id
- FROM multipaste_file_map mfm
- JOIN multipaste m ON m.multipaste_id = mfm.multipaste_id
+ FROM ".$this->db->dbprefix."multipaste_file_map mfm
+ JOIN ".$this->db->dbprefix."multipaste m ON m.multipaste_id = mfm.multipaste_id
WHERE m.url_id = ?
ORDER BY mfm.sort_order
", array($url_id))->result_array();
@@ -151,7 +151,7 @@ class Mmultipaste extends CI_Model {
{
$query = $this->db->query("
SELECT multipaste_id
- FROM multipaste
+ FROM ".$this->db->dbprefix."multipaste
WHERE url_id = ?
", array($url_id));
diff --git a/application/service/files.php b/application/service/files.php
index b4b7759e0..962939c87 100644
--- a/application/service/files.php
+++ b/application/service/files.php
@@ -30,7 +30,7 @@ class files {
SELECT sum(filesize) sum
FROM (
SELECT DISTINCT hash, filesize
- FROM files
+ FROM `".$CI->db->dbprefix."files`
WHERE user = ?
) sub
", array($user))->row_array();