Merge branch 'pgsql_controllers'

* pgsql_controllers:
  file/cron: Protecting identifiers
  Fixing multipaste delete queries

1 files changed, 2 insertions, 13 deletions

diff --git a/application/models/mmultipaste.php b/application/models/mmultipaste.php
index 9b1a7b16e..367e74787 100644
--- a/application/models/mmultipaste.php
+++ b/application/models/mmultipaste.php
@@ -90,19 +90,8 @@ class Mmultipaste extends CI_Model {
 
 	public function delete_id($id)
 	{
-		if (strpos($this->db->dbdriver, 'postgre') === FALSE) {
-			$this->db->query('
-				DELETE m, mfm
-				FROM multipaste m
-				LEFT JOIN multipaste_file_map mfm ON mfm.multipaste_id = m.multipaste_id
-				WHERE m.url_id = ?
-				', array($id));
-		} else {
-			// TODO.rafi: Deletes multipaste + multipaste_file_map
-			//            but not files. Is it supposed to?
-			$this->db->where('url_id', $id)
-				->delete('multipaste');
-		}
+		$this->db->where('url_id', $id)
+			->delete('multipaste');
 
 		if ($this->id_exists($id))  {
 			return false;