Index: branches/5.1.x/core/kernel/db/dbitem.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 12657)
+++ branches/5.1.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dbitem.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: dbitem.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
@@ -68,6 +68,13 @@
 	*/
 	var $ID;
 
+	/**
+	 * This object is used in cloning operations
+	 *
+	 * @var bool
+	 */
+	var $inCloning = false;
+
 	function kDBItem()
 	{
 		parent::kDBBase();
@@ -323,20 +330,22 @@
 	*/
 	function GetKeyClause($method=null, $keys_hash = null)
 	{
-		if( !isset($keys_hash) ) $keys_hash = Array($this->IDField => $this->ID);
+		if (!isset($keys_hash)) {
+			$keys_hash = Array ($this->IDField => $this->ID);
+		}
 
 		$ret = '';
-		foreach($keys_hash as $field => $value)
-		{
+
+		foreach ($keys_hash as $field => $value) {
 			if (!preg_match('/\./', $field)) {
-				$ret .= '(`'.$this->TableName.'`.'.$field.' = '.$this->Conn->qstr($value).') AND ';
+				$ret .= '(`' . $this->TableName . '`.' . $field . ' = ' . $this->Conn->qstr($value) . ') AND ';
 			}
 			else {
-				$ret .= '('.$field.' = '.$this->Conn->qstr($value).') AND ';
+				$ret .= '(' . $field . ' = ' . $this->Conn->qstr($value) . ') AND ';
 			}
 		}
 
-		return preg_replace('/(.*) AND $/', '\\1', $ret);
+		return substr($ret, 0, -5);
 	}
 
 	/**
@@ -472,10 +481,6 @@
 			return false;
 		}
 
-	    if (!$this->raiseEvent('OnAfterItemValidate')) {
-	    	return false;
-	    }
-
 	    if (!$this->FieldValues) {
 	    	// nothing to update
 	    	return true;
@@ -561,6 +566,9 @@
 			return true;
 		}
 
+		// will apply any custom validation to the item
+		$this->raiseEvent('OnBeforeItemValidate');
+
 		$global_res = true;
 		foreach ($this->Fields as $field => $params) {
 			$res = $this->ValidateField($field);
@@ -577,6 +585,11 @@
 			$this->Application->Debugger->dumpVars($this->FieldErrors);
 		}
 
+		if ($global_res) {
+			// no validation errors
+			$this->raiseEvent('OnAfterItemValidate');
+		}
+
 		return $global_res;
 	}
 
@@ -822,10 +835,6 @@
 			return false;
 		}
 
-		if (!$this->raiseEvent('OnAfterItemValidate')) {
-			return false;
-		}
-
 		if (is_int($force_id)) {
 			$this->FieldValues[$this->IDField] = $force_id;
 		}
@@ -1081,7 +1090,7 @@
 	function setModifiedFlag($mode = null)
 	{
 		$main_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
-		$this->Application->StoreVar($main_prefix.'_modified', '1', !$this->Application->IsAdmin());
+		$this->Application->StoreVar($main_prefix.'_modified', '1', !$this->Application->isAdmin);
 
 		if ($this->ShouldLogChanges()) {
 			$this->LogChanges($main_prefix, $mode);
@@ -1255,7 +1264,7 @@
 
 	function saveCustomFields()
 	{
-		if (!$this->customFields) {
+		if (!$this->customFields || $this->inCloning) {
 			return true;
 		}