Fix merge: value in first argument and disable caching

Ref: 542d594
cakephp · Jul 8, 2013 · 740513c · 740513c
1 parent c92ecda
commit 740513c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/lib/Cake/Console/Command/Task/ExtractTask.php
@@ -447,7 +447,7 @@ protected function _extractValidationMessages() {
 
 		$plugins = array(null);
 		if (empty($this->params['exclude-plugins'])) {
-			$plugins = array_merge($plugins, App::objects('plugins'));
+			$plugins = array_merge($plugins, App::objects('Plugin', null, false));
 		}
 		foreach ($plugins as $plugin) {
 			$this->_extractPluginValidationMessages($plugin);

diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
@@ -350,7 +350,7 @@ public function testExtractModelValidationInPlugin() {
 		$this->out = $this->getMock('Cake\Console\ConsoleOutput', array(), array(), '', false);
 		$this->in = $this->getMock('Cake\Console\ConsoleInput', array(), array(), '', false);
 		$this->Task = $this->getMock('Cake\Console\Command\Task\ExtractTask',
-			array('_isExtractingApp', '_extractValidationMessages', 'in', 'out', 'err', 'clear', '_stop'),
+			array('_isExtractingApp', 'in', 'out', 'err', 'clear', '_stop'),
 			array($this->out, $this->out, $this->in)
 		);