From f716bdd70da55f664957272734a4b88ecfd690aa Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 17 Oct 2013 04:19:42 +0200
Subject: [PATCH] Fixed option merging in Console::prompt()

defaults overided settings
---
 framework/yii/helpers/BaseConsole.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/yii/helpers/BaseConsole.php b/framework/yii/helpers/BaseConsole.php
index 6796283..3f11031 100644
--- a/framework/yii/helpers/BaseConsole.php
+++ b/framework/yii/helpers/BaseConsole.php
@@ -700,14 +700,14 @@ class BaseConsole
 	public static function prompt($text, $options = array())
 	{
 		$options = ArrayHelper::merge(
-			$options,
 			array(
 				'required'  => false,
 				'default'   => null,
 				'pattern'   => null,
 				'validator' => null,
 				'error'     => 'Invalid input.',
-			)
+			),
+			$options
 		);
 		$error   = null;