email lib system from

Lib/EmailLib.php

@@ -50,8 +50,8 @@ class EmailLib extends CakeEmail {
 	public static function systemEmail($subject, $message = 'System Email', $transportConfig = null) {
 		$class = __CLASS__;
 		$instance = new $class($transportConfig);
-		$instance->to(Configure::read('Config.admin_email'));
-		$instance->from(Configure::read('Config.admin_email'));
+		$instance->from(Configure::read('Config.system_email'), Configure::read('Config.system_name'));
+		$instance->to(Configure::read('Config.admin_email'), Configure::read('Config.admin_name'));
 		if ($subject !== null) {
 			$instance->subject($subject);
 		}
@@ -634,7 +634,14 @@ class EmailLib extends CakeEmail {
 		$this->_error = null;
 		$this->_debug = null;
 
-		$this->from(Configure::read('Config.admin_email'), Configure::read('Config.admin_emailname'));
+		if ($fromEmail = Configure::read('Config.system_email')) {
+			$fromName =  Configure::read('Config.system_name');
+		} else {
+			$fromEmail = Configure::read('Config.admin_email');
+			$fromName = Configure::read('Config.admin_name');
+		}
+		$this->from($fromEmail, $fromName);
+
 		if ($xMailer = Configure::read('Config.x-mailer')) {
 			$this->addHeaders(array('X-Mailer'=>$xMailer));
 		}

Model/MyModel.php

@@ -745,9 +745,8 @@ class MyModel extends Model {
 	/**
 	 * core-fix for multiple sort orders
 	 * @param addiotional 'scope'=>array(field,order) - value is retrieved by (submitted) primary key
-	 * 2009-07-25 ms
 	 * TODO: fix it
-	 * TODO: rename it to just find() or integrate it there
+	 * 2009-07-25 ms
 	 */
 	protected function _findNeighbors($state, $query, $results = array()) {
 		return parent::_findNeighbors($state, $query, $results);