From 0d04846c0899df3e904f922439b95b2ec51f0e2a Mon Sep 17 00:00:00 2001 From: Alexander Mohorev Date: Mon, 28 Oct 2013 23:57:40 +0300 Subject: [PATCH] php short echo syntax --- apps/advanced/frontend/views/site/contact.php | 4 ++-- apps/basic/views/site/contact.php | 4 ++-- apps/basic/views/site/login.php | 4 ++-- docs/guide/view.md | 2 +- framework/yii/views/errorHandler/exception.php | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/advanced/frontend/views/site/contact.php b/apps/advanced/frontend/views/site/contact.php index 97580ca..4202508 100644 --- a/apps/advanced/frontend/views/site/contact.php +++ b/apps/advanced/frontend/views/site/contact.php @@ -25,10 +25,10 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'email') ?> field($model, 'subject') ?> field($model, 'body')->textArea(['rows' => 6]) ?> - field($model, 'verifyCode')->widget(Captcha::className(), [ + field($model, 'verifyCode')->widget(Captcha::className(), [ 'options' => ['class' => 'form-control'], 'template' => '
{image}
{input}
', - ]); ?> + ]) ?>
'btn btn-primary']) ?>
diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php index 66711a5..cd6d9ce 100644 --- a/apps/basic/views/site/contact.php +++ b/apps/basic/views/site/contact.php @@ -33,10 +33,10 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'email') ?> field($model, 'subject') ?> field($model, 'body')->textArea(['rows' => 6]) ?> - field($model, 'verifyCode')->widget(Captcha::className(), [ + field($model, 'verifyCode')->widget(Captcha::className(), [ 'options' => ['class' => 'form-control'], 'template' => '
{image}
{input}
', - ]); ?> + ]) ?>
'btn btn-primary']) ?>
diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php index 62b4398..14522af 100644 --- a/apps/basic/views/site/login.php +++ b/apps/basic/views/site/login.php @@ -28,9 +28,9 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'password')->passwordInput() ?> - field($model, 'rememberMe', [ + field($model, 'rememberMe', [ 'template' => "
{input}
\n
{error}
", - ])->checkbox(); ?> + ])->checkbox() ?>
diff --git a/docs/guide/view.md b/docs/guide/view.md index 2fdd974..ee469e6 100644 --- a/docs/guide/view.md +++ b/docs/guide/view.md @@ -28,7 +28,7 @@ as the corresponding key. So the view for the action above should be in `views/site/index.php` and can be something like: ```php -

Hello, !

+

Hello, !

``` Instead of just scalar values you can pass anything else such as arrays or objects. diff --git a/framework/yii/views/errorHandler/exception.php b/framework/yii/views/errorHandler/exception.php index beebb29..4b90de9 100644 --- a/framework/yii/views/errorHandler/exception.php +++ b/framework/yii/views/errorHandler/exception.php @@ -367,8 +367,8 @@ pre .diff .change{
    renderCallStackItem($exception->getFile(), $exception->getLine(), null, null, 1) ?> getTrace(), $length = count($trace); $i < $length; ++$i): ?> - renderCallStackItem(@$trace[$i]['file'] ?: null, @$trace[$i]['line'] ?: null, - @$trace[$i]['class'] ?: null, @$trace[$i]['function'] ?: null, $i + 2); ?> + renderCallStackItem(@$trace[$i]['file'] ?: null, @$trace[$i]['line'] ?: null, + @$trace[$i]['class'] ?: null, @$trace[$i]['function'] ?: null, $i + 2) ?>