From a842392c30e9ef1d1d2bd9b4eb271c3fd23b853f Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 3 Feb 2015 17:17:27 +0100
Subject: Use exceptions instead of show_error

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/models/mmultipaste.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/models/mmultipaste.php')

diff --git a/application/models/mmultipaste.php b/application/models/mmultipaste.php
index 6cbf6518b..2b0196531 100644
--- a/application/models/mmultipaste.php
+++ b/application/models/mmultipaste.php
@@ -54,7 +54,7 @@ class Mmultipaste extends CI_Model {
 			return $id;
 		}
 
-		show_error("Failed to find unused ID after $max_tries tries.");
+		throw new \exceptions\PublicApiException("file/new_id-try-limit", "Failed to find unused ID after $max_tries tries");
 	}
 
 	public function id_exists($id)
-- 
cgit v1.2.3-24-g4f1b


From db8a70bbcb941fde96a0ac98919702c49814d0c5 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 5 Feb 2015 21:48:16 +0100
Subject: fixup! Support database table prefixes

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/models/mmultipaste.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'application/models/mmultipaste.php')

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));
 
-- 
cgit v1.2.3-24-g4f1b


From 67ed287e97daa9965521c9d133714bde72145711 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Fri, 6 Feb 2015 12:40:28 +0100
Subject: fixup! Support database table prefixes

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/models/mmultipaste.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'application/models/mmultipaste.php')

diff --git a/application/models/mmultipaste.php b/application/models/mmultipaste.php
index 9be4dc416..ed3b8e3a7 100644
--- a/application/models/mmultipaste.php
+++ b/application/models/mmultipaste.php
@@ -64,9 +64,9 @@ class Mmultipaste extends CI_Model {
 		}
 
 		$sql = '
-			SELECT multipaste.url_id
-			FROM '.$this->db->dbprefix.'multipaste
-			WHERE multipaste.url_id = ?
+			SELECT url_id
+			FROM `'.$this->db->dbprefix.'multipaste`
+			WHERE 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 ".$this->db->dbprefix."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 ".$this->db->dbprefix."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 ".$this->db->dbprefix."multipaste_file_map mfm
-			JOIN ".$this->db->dbprefix."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 ".$this->db->dbprefix."multipaste
+			FROM `".$this->db->dbprefix."multipaste`
 			WHERE url_id = ?
 			", array($url_id));
 
-- 
cgit v1.2.3-24-g4f1b