Merge branch 'dev' into beta

1 files changed, 1 insertions, 13 deletions

diff --git a/app/Models/Category.php b/app/Models/Category.php
index 8e1e44ef8..328bae799 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -3,14 +3,12 @@
 class FreshRSS_Category extends Minz_Model {
 	private $id = 0;
 	private $name;
-	private $color;
 	private $nbFeed = -1;
 	private $nbNotRead = -1;
 	private $feeds = null;
 
-	public function __construct ($name = '', $color = '#0062BE', $feeds = null) {
+	public function __construct ($name = '', $feeds = null) {
 		$this->_name ($name);
-		$this->_color ($color);
 		if (isset ($feeds)) {
 			$this->_feeds ($feeds);
 			$this->nbFeed = 0;
@@ -28,9 +26,6 @@ class FreshRSS_Category extends Minz_Model {
 	public function name () {
 		return $this->name;
 	}
-	public function color () {
-		return $this->color;
-	}
 	public function nbFeed () {
 		if ($this->nbFeed < 0) {
 			$catDAO = new FreshRSS_CategoryDAO ();
@@ -68,13 +63,6 @@ class FreshRSS_Category extends Minz_Model {
 	public function _name ($value) {
 		$this->name = $value;
 	}
-	public function _color ($value) {
-		if (preg_match ('/^#([0-9a-f]{3}|[0-9a-f]{6})$/i', $value)) {
-			$this->color = $value;
-		} else {
-			$this->color = '#0062BE';
-		}
-	}
 	public function _feeds ($values) {
 		if (!is_array ($values)) {
 			$values = array ($values);