diff --git a/readme-ptbr.md b/readme-ptbr.md new file mode 100644 index 00000000..faa1ad4d --- /dev/null +++ b/readme-ptbr.md @@ -0,0 +1,9 @@ +![LaravelCollective HTML](LaravelCollectiveHTML-banner.png) + +[![Build Status](https://travis-ci.org/LaravelCollective/html.svg)](https://travis-ci.org/LaravelCollective/html) +[![Total Downloads](https://poser.pugx.org/LaravelCollective/html/downloads)](https://packagist.org/packages/laravelcollective/html) +[![Latest Stable Version](https://poser.pugx.org/LaravelCollective/html/v/stable.svg)](https://packagist.org/packages/laravelcollective/html) +[![Latest Unstable Version](https://poser.pugx.org/LaravelCollective/html/v/unstable.svg)](https://packagist.org/packages/laravelcollective/html) +[![License](https://poser.pugx.org/LaravelCollective/html/license.svg)](https://packagist.org/packages/laravelcollective/html) + +A documentaĆ§Ć£o oficial para Forms & Html para o framework Laravel podem ser encontrados no site [LaravelCollective](https://laravelcollective.com/docs). diff --git a/src/FormBuilder.php b/src/FormBuilder.php index 1060ea4b..4cd0937d 100644 --- a/src/FormBuilder.php +++ b/src/FormBuilder.php @@ -1360,7 +1360,7 @@ protected function getModelValueAttribute($name) return $this->model->getFormValue($key); } - return data_get($this->model, $this->transformKey($name)); + return data_get($this->model, $key); } /** diff --git a/src/HtmlBuilder.php b/src/HtmlBuilder.php index c9ed8d38..896e1b19 100755 --- a/src/HtmlBuilder.php +++ b/src/HtmlBuilder.php @@ -171,12 +171,13 @@ public function link($url, $title = null, $attributes = [], $secure = null, $esc * @param string $url * @param string $title * @param array $attributes + * @param bool $escape * * @return \Illuminate\Support\HtmlString */ - public function secureLink($url, $title = null, $attributes = []) + public function secureLink($url, $title = null, $attributes = [], $escape = true) { - return $this->link($url, $title, $attributes, true); + return $this->link($url, $title, $attributes, true, $escape); } /** @@ -186,14 +187,15 @@ public function secureLink($url, $title = null, $attributes = []) * @param string $title * @param array $attributes * @param bool $secure + * @param bool $escape * * @return \Illuminate\Support\HtmlString */ - public function linkAsset($url, $title = null, $attributes = [], $secure = null) + public function linkAsset($url, $title = null, $attributes = [], $secure = null, $escape = true) { $url = $this->url->asset($url, $secure); - return $this->link($url, $title ?: $url, $attributes, $secure); + return $this->link($url, $title ?: $url, $attributes, $secure, $escape); } /** @@ -202,12 +204,13 @@ public function linkAsset($url, $title = null, $attributes = [], $secure = null) * @param string $url * @param string $title * @param array $attributes + * @param bool $escape * * @return \Illuminate\Support\HtmlString */ - public function linkSecureAsset($url, $title = null, $attributes = []) + public function linkSecureAsset($url, $title = null, $attributes = [], $escape = true) { - return $this->linkAsset($url, $title, $attributes, true); + return $this->linkAsset($url, $title, $attributes, true, $escape); } /** @@ -217,12 +220,14 @@ public function linkSecureAsset($url, $title = null, $attributes = []) * @param string $title * @param array $parameters * @param array $attributes + * @param bool $secure + * @param bool $escape * * @return \Illuminate\Support\HtmlString */ - public function linkRoute($name, $title = null, $parameters = [], $attributes = []) + public function linkRoute($name, $title = null, $parameters = [], $attributes = [], $secure = null, $escape = true) { - return $this->link($this->url->route($name, $parameters), $title, $attributes); + return $this->link($this->url->route($name, $parameters), $title, $attributes, $secure, $escape); } /** @@ -232,12 +237,14 @@ public function linkRoute($name, $title = null, $parameters = [], $attributes = * @param string $title * @param array $parameters * @param array $attributes + * @param bool $secure + * @param bool $escape * * @return \Illuminate\Support\HtmlString */ - public function linkAction($action, $title = null, $parameters = [], $attributes = []) + public function linkAction($action, $title = null, $parameters = [], $attributes = [], $secure = null, $escape = true) { - return $this->link($this->url->action($action, $parameters), $title, $attributes); + return $this->link($this->url->action($action, $parameters), $title, $attributes, $secure, $escape); } /**