From f43a67bd362838ad8fcfe3a7d0532b4d0dbf25c5 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 6 Sep 2008 14:24:04 -0400
Subject: [PATCH] Change BSApi::remove() to BSApi::delete()

* Api.php:
(BSApi::remove): Renamed to delete()
---
 Api.php | 12 ++++++------
 CHANGES |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Api.php b/Api.php
index ea93263..0e5ecd3 100644
--- a/Api.php
+++ b/Api.php
@@ -62,7 +62,7 @@ if (!defined('REQ_AUTO'))
  * Abstract API
  *
  * Abstract class that is used as an API base for most common database interaction
- * schemes. Creates a simple structure that holds data and can update, remove, and
+ * schemes. Creates a simple structure that holds data and can update, delete, and
  * insert.
  * 
  * Life-cycle of a new object:
@@ -374,10 +374,10 @@ abstract class BSApi
 	/**
 	 * Deletes a record
 	 *
-	 * @param	bool	Run pre_remove()?
-	 * @param	bool	Run post_remove()?
+	 * @param	bool	Run pre_delete()?
+	 * @param	bool	Run post_delete()?
 	 */
-	public function remove($doPre = true, $doPost = true)
+	public function delete($doPre = true, $doPost = true)
 	{
 		if (!$this->condition)
 		{
@@ -386,11 +386,11 @@ abstract class BSApi
 		
 		$this->fetch();
 		
-		$this->_runActionMethod('pre_remove', $doPre);
+		$this->_runActionMethod('pre_delete', $doPre);
 		
 		BSApp::$db->query("DELETE FROM {$this->prefix}{$this->table} WHERE {$this->condition}");
 		
-		$this->_runActionMethod('post_remove', $doPost);
+		$this->_runActionMethod('post_delete', $doPost);
 	}
 	
 	/**
diff --git a/CHANGES b/CHANGES
index 81fa2e2..5ff97e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 3.1.2
 ===================
 - Fixed: BSDb::query() would not generate a Result object for explain, show, and describe queries
+- Change: Change BSApi::remove() to be ::delete() again
 
 3.1.1
 ===================
-- 
2.22.5