Fix missed bits from merge with 2.4

cakephp · Mar 15, 2013 · 752d589 · 752d589
1 parent cf9691a
commit 752d589
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/Cake/Error/MissingDatasourceException.php b/lib/Cake/Error/MissingDatasourceException.php
@@ -25,6 +25,6 @@
  */
 class MissingDatasourceException extends Exception {
 
-	protected $_messageTemplate = 'Datasource class %s could not be found.';
+	protected $_messageTemplate = 'Datasource class %s could not be found. %s';
 
 }
diff --git a/lib/Cake/Log/LogTrait.php b/lib/Cake/Log/LogTrait.php
@@ -27,13 +27,14 @@ trait LogTrait {
  *
  * @param string $msg Log message
  * @param integer $type Error type constant. Defined in app/Config/logging.php.
+ * @param string $scope The name of the log scope.
  * @return boolean Success of log write
  */
-	public function log($msg, $type = LOG_ERR) {
+	public function log($msg, $type = LOG_ERR, $scope = null) {
 		if (!is_string($msg)) {
 			$msg = print_r($msg, true);
 		}
-		return Log::write($type, $msg);
+		return Log::write($type, $msg, $scope);
 	}
 
 }
diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php
@@ -99,7 +99,7 @@ public static function getDataSource($name) {
 		$class = static::loadDataSource($name);
 
 		if (strpos(App::location($class), 'Datasource') === false) {
-			throw new MissingDatasourceException(array(
+			throw new Error\MissingDatasourceException(array(
 				'class' => $class,
 				'plugin' => null,
 				'message' => 'Datasource is not found in Model/Datasource package.'