Commits

Christoffer Niska committed b534b4d Merge

merged heads

  • Participants
  • Parent commits 17ae175, ed9e18d
  • Branches bootstrap-2.0.1

Comments (0)

Files changed (1)

File widgets/BootButtonColumn.php

 	{
 		parent::initDefaultButtons();
 
-		if ($this->viewButtonIcon !== false)
-			$this->buttons['view']['icon'] = $this->viewButtonIcon;
-		if ($this->updateButtonIcon !== false)
-			$this->buttons['update']['icon'] = $this->updateButtonIcon;
-		if ($this->deleteButtonIcon !== false)
-			$this->buttons['delete']['icon'] = $this->deleteButtonIcon;
+        if ($this->viewButtonIcon !== false && !isset($this->buttons['view']['icon']))
+            $this->buttons['view']['icon'] = $this->viewButtonIcon;
+        if ($this->updateButtonIcon !== false && !isset($this->buttons['update']['icon']))
+            $this->buttons['update']['icon'] = $this->updateButtonIcon;
+        if ($this->deleteButtonIcon !== false && !isset($this->buttons['delete']['icon']))
+            $this->buttons['delete']['icon'] = $this->deleteButtonIcon;
 	}
 
 	/**