pradosoft / prado

framework/Web/UI/WebControls/TRegularExpressionValidator.php

Spacing +2 added lines, -2 removed lines

@@ -79,9 +79,9 @@
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
+		if (($value = $this->getValidationValue($this->getValidationTarget())) === '')
 			return true;
-		if(($expression = addcslashes($this->getRegularExpression(), "/")) !== '')
+		if (($expression = addcslashes($this->getRegularExpression(), "/")) !== '')
 		{
 			$mods = $this->getPatternModifiers();
 			return preg_match("/^$expression\$/{$mods}", $value);

Braces +5 added lines, -4 removed lines

@@ -79,15 +79,16 @@
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
-			return true;
+		if(($value = $this->getValidationValue($this->getValidationTarget())) === '') {
+					return true;
+		}
 		if(($expression = addcslashes($this->getRegularExpression(), "/")) !== '')
 		{
 			$mods = $this->getPatternModifiers();
 			return preg_match("/^$expression\$/{$mods}", $value);
+		} else {
+					return true;
 		}
-		else
-			return true;
 	}
 
 	/**

framework/Web/UI/WebControls/TButtonColumn.php

Spacing +8 added lines, -8 removed lines

@@ -220,12 +220,12 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
 			$buttonType = $this->getButtonType();
-			if($buttonType === TButtonColumnType::LinkButton)
+			if ($buttonType === TButtonColumnType::LinkButton)
 				$button = new TLinkButton;
-			elseif($buttonType === TButtonColumnType::PushButton)
+			elseif ($buttonType === TButtonColumnType::PushButton)
 				$button = new TButton;
 			else // image button
 			{
@@ -237,8 +237,8 @@ 
 			$button->setCommandName($this->getCommandName());
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
-			if($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== ''))
-				$button->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if ($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== ''))
+				$button->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button', $button);
 		}
@@ -253,15 +253,15 @@ 
 	 */
 	public function dataBindColumn($sender, $param)
 	{
-		if($sender instanceof \Prado\Web\UI\IButtonControl)
+		if ($sender instanceof \Prado\Web\UI\IButtonControl)
 		{
-			if(($field = $this->getDataTextField()) !== '')
+			if (($field = $this->getDataTextField()) !== '')
 			{
 				$value = $this->getDataFieldValue($sender->getNamingContainer()->getData(), $field);
 				$text = $this->formatDataValue($this->getDataTextFormatString(), $value);
 				$sender->setText($text);
 			}
-			if(($sender instanceof TImageButton) && ($field = $this->getDataImageUrlField()) !== '')
+			if (($sender instanceof TImageButton) && ($field = $this->getDataImageUrlField()) !== '')
 			{
 				$value = $this->getDataFieldValue($sender->getNamingContainer()->getData(), $field);
 				$url = $this->formatDataValue($this->getDataImageUrlFormatString(), $value);

Braces +10 added lines, -9 removed lines

@@ -223,11 +223,11 @@ 
 		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
 			$buttonType = $this->getButtonType();
-			if($buttonType === TButtonColumnType::LinkButton)
-				$button = new TLinkButton;
-			elseif($buttonType === TButtonColumnType::PushButton)
-				$button = new TButton;
-			else // image button
+			if($buttonType === TButtonColumnType::LinkButton) {
+							$button = new TLinkButton;
+			} elseif($buttonType === TButtonColumnType::PushButton) {
+							$button = new TButton;
+			} else // image button
 			{
 				$button = new TImageButton;
 				$button->setImageUrl($this->getImageUrl());
@@ -237,13 +237,14 @@ 
 			$button->setCommandName($this->getCommandName());
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
-			if($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== ''))
-				$button->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== '')) {
+							$button->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			}
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button', $button);
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**

framework/Web/UI/WebControls/TAccordionViewCollection.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAccordionView)
+		if ($item instanceof TAccordionView)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
@@ -47,9 +47,9 @@ 
 	 */
 	public function findIndexByID($id)
 	{
-		foreach($this as $index => $view)
+		foreach ($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
+			if ($view->getID(false) === $id)
 				return $index;
 		}
 		return -1;

Braces +8 added lines, -6 removed lines

@@ -34,10 +34,11 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAccordionView)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		if($item instanceof TAccordionView) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		}
 	}
 
 	/**
@@ -49,8 +50,9 @@ 
 	{
 		foreach($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
-				return $index;
+			if($view->getID(false) === $id) {
+							return $index;
+			}
 		}
 		return -1;
 	}

framework/Web/UI/WebControls/TDataListItemRenderer.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style = $this->getViewState('Style', null))
+		if ($style = $this->getViewState('Style', null))
 			return $style;
 		else
 		{
@@ -79,7 +79,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
@@ -108,7 +108,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($style = $this->getViewState('Style', null))
+		if ($style = $this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 	}
 
@@ -124,7 +124,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getTagName() !== '')
+		if ($this->getTagName() !== '')
 		{
 			$this->renderBeginTag($writer);
 			$this->renderContents($writer);

Braces +10 added lines, -9 removed lines

@@ -52,9 +52,9 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style = $this->getViewState('Style', null))
-			return $style;
-		else
+		if($style = $this->getViewState('Style', null)) {
+					return $style;
+		} else
 		{
 			$style = $this->createStyle();
 			$this->setViewState('Style', $style, null);
@@ -83,9 +83,9 @@ 
 		{
 			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -108,8 +108,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($style = $this->getViewState('Style', null))
-			$style->addAttributesToRender($writer);
+		if($style = $this->getViewState('Style', null)) {
+					$style->addAttributesToRender($writer);
+		}
 	}
 
 	/**
@@ -129,9 +130,9 @@ 
 			$this->renderBeginTag($writer);
 			$this->renderContents($writer);
 			$this->renderEndTag($writer);
+		} else {
+					$this->renderContents($writer);
 		}
-		else
-			$this->renderContents($writer);
 	}
 
 	/**

framework/Web/UI/WebControls/TCustomValidator.php

Spacing +5 added lines, -5 removed lines

@@ -86,7 +86,7 @@ 
 	public function evaluateIsValid()
 	{
 		$value = '';
-		if($this->getValidationTarget() !== null)
+		if ($this->getValidationTarget() !== null)
 			$value = $this->getValidationValue($this->getValidationTarget());
 		return $this->onServerValidate($value);
 	}
@@ -112,9 +112,9 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
+		if (($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
 			return $control;
-		elseif(($id = $this->getControlToValidate()) !== '')
+		elseif (($id = $this->getControlToValidate()) !== '')
 			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 		else
 			return null;
@@ -127,7 +127,7 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($clientJs = $this->getClientValidationFunction()) !== '')
+		if (($clientJs = $this->getClientValidationFunction()) !== '')
 			$options['ClientValidationFunction'] = $clientJs;
 		return $options;
 	}
@@ -138,7 +138,7 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		if($this->getClientValidationFunction() !== '')
+		if ($this->getClientValidationFunction() !== '')
 			parent::registerClientScriptValidator();
 	}
 }
\ No newline at end of file

Braces +16 added lines, -12 removed lines

@@ -86,8 +86,9 @@ 
 	public function evaluateIsValid()
 	{
 		$value = '';
-		if($this->getValidationTarget() !== null)
-			$value = $this->getValidationValue($this->getValidationTarget());
+		if($this->getValidationTarget() !== null) {
+					$value = $this->getValidationValue($this->getValidationTarget());
+		}
 		return $this->onServerValidate($value);
 	}
 
@@ -112,12 +113,13 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
-			return $control;
-		elseif(($id = $this->getControlToValidate()) !== '')
-			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
-		else
-			return null;
+		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null) {
+					return $control;
+		} elseif(($id = $this->getControlToValidate()) !== '') {
+					throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -127,8 +129,9 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($clientJs = $this->getClientValidationFunction()) !== '')
-			$options['ClientValidationFunction'] = $clientJs;
+		if(($clientJs = $this->getClientValidationFunction()) !== '') {
+					$options['ClientValidationFunction'] = $clientJs;
+		}
 		return $options;
 	}
 
@@ -138,7 +141,8 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		if($this->getClientValidationFunction() !== '')
-			parent::registerClientScriptValidator();
+		if($this->getClientValidationFunction() !== '') {
+					parent::registerClientScriptValidator();
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php

Spacing +14 added lines, -14 removed lines

@@ -54,13 +54,13 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TWizardNavigationButtonStyle)
+		if ($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($this->_imageUrl === null && $style->_imageUrl !== null)
+			if ($this->_imageUrl === null && $style->_imageUrl !== null)
 				$this->_imageUrl = $style->_imageUrl;
-			if($this->_buttonText === null && $style->_buttonText !== null)
+			if ($this->_buttonText === null && $style->_buttonText !== null)
 				$this->_buttonText = $style->_buttonText;
-			if($this->_buttonType === null && $style->_buttonType !== null)
+			if ($this->_buttonType === null && $style->_buttonType !== null)
 				$this->_buttonType = $style->_buttonType;
 		}
 	}
@@ -74,13 +74,13 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TWizardNavigationButtonStyle)
+		if ($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($style->_imageUrl !== null)
+			if ($style->_imageUrl !== null)
 				$this->_imageUrl = $style->_imageUrl;
-			if($style->_buttonText !== null)
+			if ($style->_buttonText !== null)
 				$this->_buttonText = $style->_buttonText;
-			if($style->_buttonType !== null)
+			if ($style->_buttonType !== null)
 				$this->_buttonType = $style->_buttonType;
 		}
 	}
@@ -90,7 +90,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->_imageUrl === null?'':$this->_imageUrl;
+		return $this->_imageUrl === null ? '' : $this->_imageUrl;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function getButtonText()
 	{
-		return $this->_buttonText === null?'':$this->_buttonText;
+		return $this->_buttonText === null ? '' : $this->_buttonText;
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->_buttonType === null? TWizardNavigationButtonType::Button :$this->_buttonType;
+		return $this->_buttonType === null ? TWizardNavigationButtonType::Button : $this->_buttonType;
 	}
 
 	/**
@@ -139,12 +139,12 @@ 
 	 */
 	public function apply($button)
 	{
-		if($button instanceof TImageButton)
+		if ($button instanceof TImageButton)
 		{
-			if($button->getImageUrl() === '')
+			if ($button->getImageUrl() === '')
 				$button->setImageUrl($this->getImageUrl());
 		}
-		if($button->getText() === '')
+		if ($button->getText() === '')
 			$button->setText($this->getButtonText());
 		$button->getStyle()->mergeWith($this);
 	}

Braces +24 added lines, -16 removed lines

@@ -56,12 +56,15 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($this->_imageUrl === null && $style->_imageUrl !== null)
-				$this->_imageUrl = $style->_imageUrl;
-			if($this->_buttonText === null && $style->_buttonText !== null)
-				$this->_buttonText = $style->_buttonText;
-			if($this->_buttonType === null && $style->_buttonType !== null)
-				$this->_buttonType = $style->_buttonType;
+			if($this->_imageUrl === null && $style->_imageUrl !== null) {
+							$this->_imageUrl = $style->_imageUrl;
+			}
+			if($this->_buttonText === null && $style->_buttonText !== null) {
+							$this->_buttonText = $style->_buttonText;
+			}
+			if($this->_buttonType === null && $style->_buttonType !== null) {
+							$this->_buttonType = $style->_buttonType;
+			}
 		}
 	}
 
@@ -76,12 +79,15 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($style->_imageUrl !== null)
-				$this->_imageUrl = $style->_imageUrl;
-			if($style->_buttonText !== null)
-				$this->_buttonText = $style->_buttonText;
-			if($style->_buttonType !== null)
-				$this->_buttonType = $style->_buttonType;
+			if($style->_imageUrl !== null) {
+							$this->_imageUrl = $style->_imageUrl;
+			}
+			if($style->_buttonText !== null) {
+							$this->_buttonText = $style->_buttonText;
+			}
+			if($style->_buttonType !== null) {
+							$this->_buttonType = $style->_buttonType;
+			}
 		}
 	}
 
@@ -141,11 +147,13 @@ 
 	{
 		if($button instanceof TImageButton)
 		{
-			if($button->getImageUrl() === '')
-				$button->setImageUrl($this->getImageUrl());
+			if($button->getImageUrl() === '') {
+							$button->setImageUrl($this->getImageUrl());
+			}
+		}
+		if($button->getText() === '') {
+					$button->setText($this->getButtonText());
 		}
-		if($button->getText() === '')
-			$button->setText($this->getButtonText());
 		$button->getStyle()->mergeWith($this);
 	}
 }

framework/Web/UI/WebControls/TLiteral.php

Spacing +2 added lines, -2 removed lines

@@ -101,9 +101,9 @@
 	 */
 	public function render($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 		{
-			if($this->getEncode())
+			if ($this->getEncode())
 				$writer->write(THttpUtility::htmlEncode($text));
 			else
 				$writer->write($text);

Braces +7 added lines, -6 removed lines

@@ -103,13 +103,14 @@
 	{
 		if(($text = $this->getText()) !== '')
 		{
-			if($this->getEncode())
-				$writer->write(THttpUtility::htmlEncode($text));
-			else
-				$writer->write($text);
+			if($this->getEncode()) {
+							$writer->write(THttpUtility::htmlEncode($text));
+			} else {
+							$writer->write($text);
+			}
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
 

framework/Web/UI/WebControls/TDropDownListColumn.php

Spacing +13 added lines, -13 removed lines

@@ -77,7 +77,7 @@ 
 	{
 		parent::loadState($state);
 		$this->_stateLoaded = true;
-		if(!$this->_dataBound)
+		if (!$this->_dataBound)
 			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
 	}
 
@@ -100,7 +100,7 @@ 
 	public function addParsedObject($object)
 	{
 		// Do not add items from template if items are loaded from viewstate
-		if(!$this->_stateLoaded && ($object instanceof TListItem))
+		if (!$this->_stateLoaded && ($object instanceof TListItem))
 		{
 			$object->setSelected(false);
 			$index = $this->_listControl->getItems()->add($object);
@@ -254,7 +254,7 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if(!$this->_dataBound && $this->_listControl->getDataSource() !== null)
+		if (!$this->_dataBound && $this->_listControl->getDataSource() !== null)
 		{
 			$this->_listControl->setDataTextField($this->getListTextField());
 			$this->_listControl->setDataValueField($this->getListValueField());
@@ -262,10 +262,10 @@ 
 			$this->_listControl->dataBind();
 			$this->_dataBound = true;
 		}
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::EditItem:
-				if(!$this->getReadOnly())
+				if (!$this->getReadOnly())
 				{
 					$listControl = clone $this->_listControl;
 					$cell->getControls()->add($listControl);
@@ -274,13 +274,13 @@ 
 				}
 				else
 					$control = $cell;
-				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
-				if($this->getDataTextField() !== '' || $this->getDataValueField() !== '')
-					$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				if ($this->getDataTextField() !== '' || $this->getDataValueField() !== '')
+					$cell->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			default:
 				parent::initializeCell($cell, $columnIndex, $itemType);
@@ -297,23 +297,23 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($valueField = $this->getDataValueField()) !== '')
+		if (($valueField = $this->getDataValueField()) !== '')
 			$value = $this->getDataFieldValue($data, $valueField);
 		else
 			$value = '';
-		if(($textField = $this->getDataTextField()) !== '')
+		if (($textField = $this->getDataTextField()) !== '')
 		{
 			$text = $this->getDataFieldValue($data, $textField);
-			if($valueField === '')
+			if ($valueField === '')
 				$value = $text;
 			$formatString = $this->getDataTextFormatString();
 			$text = $this->formatDataValue($formatString, $text);
 		}
 		else
 			$text = $value;
-		if($sender instanceof TTableCell)
+		if ($sender instanceof TTableCell)
 			$sender->setText($text);
-		elseif($sender instanceof TDropDownList)
+		elseif ($sender instanceof TDropDownList)
 			$sender->setSelectedValue($value);
 	}
 }

Braces +23 added lines, -18 removed lines

@@ -77,8 +77,9 @@ 
 	{
 		parent::loadState($state);
 		$this->_stateLoaded = true;
-		if(!$this->_dataBound)
-			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
+		if(!$this->_dataBound) {
+					$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
+		}
 	}
 
 	/**
@@ -271,16 +272,17 @@ 
 					$cell->getControls()->add($listControl);
 					$cell->registerObject('DropDownList', $listControl);
 					$control = $listControl;
+				} else {
+									$control = $cell;
 				}
-				else
-					$control = $cell;
 				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
-				if($this->getDataTextField() !== '' || $this->getDataValueField() !== '')
-					$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				if($this->getDataTextField() !== '' || $this->getDataValueField() !== '') {
+									$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				}
 				break;
 			default:
 				parent::initializeCell($cell, $columnIndex, $itemType);
@@ -297,24 +299,27 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($valueField = $this->getDataValueField()) !== '')
-			$value = $this->getDataFieldValue($data, $valueField);
-		else
-			$value = '';
+		if(($valueField = $this->getDataValueField()) !== '') {
+					$value = $this->getDataFieldValue($data, $valueField);
+		} else {
+					$value = '';
+		}
 		if(($textField = $this->getDataTextField()) !== '')
 		{
 			$text = $this->getDataFieldValue($data, $textField);
-			if($valueField === '')
-				$value = $text;
+			if($valueField === '') {
+							$value = $text;
+			}
 			$formatString = $this->getDataTextFormatString();
 			$text = $this->formatDataValue($formatString, $text);
+		} else {
+					$text = $value;
+		}
+		if($sender instanceof TTableCell) {
+					$sender->setText($text);
+		} elseif($sender instanceof TDropDownList) {
+					$sender->setSelectedValue($value);
 		}
-		else
-			$text = $value;
-		if($sender instanceof TTableCell)
-			$sender->setText($text);
-		elseif($sender instanceof TDropDownList)
-			$sender->setSelectedValue($value);
 	}
 }
 

framework/Web/UI/WebControls/TRepeaterItem.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$this->raiseBubbleEvent($this, new TRepeaterCommandEventParameter($this, $sender, $param));
 			return true;

Braces +2 added lines, -2 removed lines

@@ -110,8 +110,8 @@
 		{
 			$this->raiseBubbleEvent($this, new TRepeaterCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
\ No newline at end of file