diff --git a/app/models/Entry.php b/app/models/Entry.php index 4cdcf8265..4790a1681 100755 --- a/app/models/Entry.php +++ b/app/models/Entry.php @@ -1,6 +1,7 @@ guid . Configuration::selApplication ()); + if(is_null($this->id)) { + return small_hash ($this->guid . Configuration::selApplication ()); + } else { + return $this->id; + } } public function guid () { return $this->guid; @@ -63,7 +68,10 @@ class Entry extends Model { return $this->feed; } } - + + public function _id ($value) { + $this->id = $value; + } public function _guid ($value) { $this->guid = $value; } @@ -370,6 +378,10 @@ class HelperEntry { $dao['is_read'], $dao['is_favorite'] ); + + if (isset ($dao['id'])) { + $list[$key]->_id ($dao['id']); + } } return $list; diff --git a/app/models/Feed.php b/app/models/Feed.php index 67874925f..db051c948 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -1,6 +1,7 @@ url . Configuration::selApplication ()); + if(is_null($this->id)) { + return small_hash ($this->url . Configuration::selApplication ()); + } else { + return $this->id; + } } public function url () { return $this->url; @@ -45,7 +50,10 @@ class Feed extends Model { $feedDAO = new FeedDAO (); return $feedDAO->countEntries ($this->id ()); } - + + public function _id ($value) { + $this->id = $value; + } public function _url ($value) { if (!is_null ($value) && !preg_match ('#^https?://#', $value)) { $value = 'http://' . $value; @@ -294,6 +302,10 @@ class HelperFeed { $list[$key]->_website ($dao['website']); $list[$key]->_description ($dao['description']); $list[$key]->_lastUpdate ($dao['lastUpdate']); + + if (isset ($dao['id'])) { + $list[$key]->_id ($dao['id']); + } } return $list;