Use array_merge better for config merge.

Model/Behavior/JsonableBehavior.php

@@ -50,7 +50,7 @@ class JsonableBehavior extends ModelBehavior {
 	);
 
 	public function setup(Model $Model, $config = array()) {
-		$this->settings[$Model->alias] = Set::merge($this->_defaultSettings, $config);
+		$this->settings[$Model->alias] = array_merge($this->_defaultSettings, $config);
 		//extract($this->settings[$Model->alias]);
 		if (!is_array($this->settings[$Model->alias]['fields'])) {
 			$this->settings[$Model->alias]['fields'] = (array)$this->settings[$Model->alias]['fields'];

Model/Behavior/PasswordableBehavior.php

@@ -236,9 +236,9 @@ class PasswordableBehavior extends ModelBehavior {
 	public function setup(Model $Model, $config = array()) {
 		$defaults = $this->_defaults;
 		if ($configureDefaults = Configure::read('Passwordable')) {
-			$defaults = Set::merge($defaults, $configureDefaults);
+			$defaults = array_merge($defaults, $configureDefaults);
 		}
-		$this->settings[$Model->alias] = Set::merge($defaults, $config);
+		$this->settings[$Model->alias] = array_merge($defaults, $config);
 
 		// BC comp
 		if ($this->settings[$Model->alias]['allowEmpty']) {

Model/Behavior/SluggedBehavior.php

@@ -94,9 +94,9 @@ class SluggedBehavior extends ModelBehavior {
 		foreach ($this->_defaultSettings['replace'] as $key => $value) {
 			$this->_defaultSettings['replace'][$key] = __($value);
 		}
-		$this->_defaultSettings = Set::merge($this->_defaultSettings, (array)Configure::read('Slugged'));
+		$this->_defaultSettings = array_merge($this->_defaultSettings, (array)Configure::read('Slugged'));
 
-		$this->settings[$Model->alias] = Set::merge($this->_defaultSettings, $config);
+		$this->settings[$Model->alias] = array_merge($this->_defaultSettings, $config);
 		extract($this->settings[$Model->alias]);
 		$label = $this->settings[$Model->alias]['label'] = (array)$label;
 		if ($Model->Behaviors->loaded('Translate')) {
@@ -365,6 +365,7 @@ class SluggedBehavior extends ModelBehavior {
 		extract($this->settings[$Model->alias]);
 		$this->_setEncoding($Model, $encoding, $string, !Configure::read('debug'));
 
+		$string = str_replace(array("\r\n", "\r", "\n"), ' ', $string);
 		if ($replace) {
 			$string = str_replace(array_keys($replace), array_values($replace), $string);
 		}

Test/Case/Model/Behavior/PasswordableBehaviorTest.php

@@ -17,6 +17,7 @@ class PasswordableBehaviorTest extends CakeTestCase {
 	public function setUp() {
 		parent::setUp();
 
+		Configure::delete('Passwordable');
 		Configure::write('Passwordable.auth', 'AuthTest');
 
 		$this->User = ClassRegistry::init('Tools.ToolsUser');