Browse Source

Merge pull request #8691 from mongosoft/master

Remove unused variables
tags/2.0.6
Paul Klimov 9 years ago
parent
commit
71b4786850
  1. 1
      framework/validators/DateValidator.php
  2. 2
      framework/widgets/Breadcrumbs.php

1
framework/validators/DateValidator.php

@ -276,7 +276,6 @@ class DateValidator extends Validator
{
if (isset($this->_dateFormats[$format])) {
$formatter = new IntlDateFormatter($this->locale, $this->_dateFormats[$format], IntlDateFormatter::NONE, 'UTC');
$hasTimeInfo = false;
} else {
// if no time was provided in the format string set time to 0 to get a simple date timestamp
$hasTimeInfo = (strpbrk($format, 'ahHkKmsSA') !== false);

2
framework/widgets/Breadcrumbs.php

@ -160,7 +160,7 @@ class Breadcrumbs extends Widget
*/
protected function renderItem($link, $template)
{
$encodeLabel = $encode = ArrayHelper::remove($link, 'encode', $this->encodeLabels);
$encodeLabel = ArrayHelper::remove($link, 'encode', $this->encodeLabels);
if (array_key_exists('label', $link)) {
$label = $encodeLabel ? Html::encode($link['label']) : $link['label'];
} else {

Loading…
Cancel
Save