Version 4.2.0

system/Patterns/ActiveRecord.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Active Record Pattern
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		18 Feb 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Patterns;
@@ -467,6 +466,9 @@ abstract class _ActiveRecord
 			
 			$this->_new = FALSE;
 
+			/* Reset our log of what's changed */
+			$this->changed = array();
+
 			static::$multitons[ $this->$primaryKey ] = $this;
 		}
 		elseif( !empty( $data ) )
@@ -486,17 +488,25 @@ abstract class _ActiveRecord
 				}
 			}
 						
-			/* Work out the ID */
-			$idColumn = static::$databaseColumnId;
-
 			/* Save */
-			static::db()->update( static::$databaseTable, $update, array( static::$databasePrefix . $idColumn . '=?', $this->$idColumn ) );
+			static::db()->update( static::$databaseTable, $update, $this->_whereClauseForSave() );
 			
 			/* Reset our log of what's changed */
 			$this->changed = array();
 		}
 	}
 	
+	/**
+	 * Get the WHERE clause for save()
+	 *
+	 * @return	void
+	 */
+	protected function _whereClauseForSave()
+	{
+		$idColumn = static::$databaseColumnId;
+		return array( static::$databasePrefix . $idColumn . '=?', $this->$idColumn );
+	}
+	
 	/**
 	 * [ActiveRecord] Delete Record
 	 *