Merge pull request #165 from paulcanning/2.5-stable

Fix for delete flag default type in SQL and list_pms function
emreakay · Jul 26, 2016 · a0391c8 · a0391c8
2 parents 4672cf8 + e404e0a
commit a0391c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php
@@ -1918,11 +1918,11 @@ public function send_pms( $sender_id, $receiver_ids, $title, $message ){
 	public function list_pms($limit=5, $offset=0, $receiver_id=NULL, $sender_id=NULL){
 		if (is_numeric($receiver_id)){
 			$query = $this->aauth_db->where('receiver_id', $receiver_id);
-			$query = $this->aauth_db->where('pm_deleted_receiver', 0);
+			$query = $this->aauth_db->where('pm_deleted_receiver', NULL);
 		}
 		if (is_numeric($sender_id)){
 			$query = $this->aauth_db->where('sender_id', $sender_id);
-			$query = $this->aauth_db->where('pm_deleted_sender', 0);
+			$query = $this->aauth_db->where('pm_deleted_sender', NULL);
 		}
 
 		$query = $this->aauth_db->order_by('id','DESC');

diff --git a/sql/Aauth_v2.sql b/sql/Aauth_v2.sql
@@ -77,8 +77,8 @@ CREATE TABLE `aauth_pms` (
   `message` text,
   `date_sent` datetime DEFAULT NULL,
   `date_read` datetime DEFAULT NULL,
-  `pm_deleted_sender` int(1) DEFAULT '0',
-  `pm_deleted_receiver` int(1) DEFAULT '0',
+  `pm_deleted_sender` int(1) DEFAULT NULL,
+  `pm_deleted_receiver` int(1) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `full_index` (`id`,`sender_id`,`receiver_id`,`date_read`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

diff --git a/sql/Aauth_v2_BCrypt.sql b/sql/Aauth_v2_BCrypt.sql
@@ -77,8 +77,8 @@ CREATE TABLE `aauth_pms` (
   `message` text,
   `date_sent` datetime DEFAULT NULL,
   `date_read` datetime DEFAULT NULL,
-  `pm_deleted_sender` int(1) DEFAULT '0',
-  `pm_deleted_receiver` int(1) DEFAULT '0',
+  `pm_deleted_sender` int(1) DEFAULT NULL,
+  `pm_deleted_receiver` int(1) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `full_index` (`id`,`sender_id`,`receiver_id`,`date_read`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;