diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-02 09:36:32 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-02 09:36:32 +0200 |
| commit | f1a5a174ea8731cbfbe8d9d692976765030b5f80 (patch) | |
| tree | 38af1844daeab2b430bddd02a4b07d9879d27142 /app/Models | |
| parent | 7be9613fa6bf4718e700d01f58f599c8d50e1501 (diff) | |
| parent | bbedca510bb0b88850476bf2e2aa6af8c02ac741 (diff) | |
Merge branch '646-new-cat-system' into dev
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/Category.php | 2 | ||||
| -rw-r--r-- | app/Models/Themes.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/Models/Category.php b/app/Models/Category.php index 0a0dbd3ca..e5f6c4334 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -61,7 +61,7 @@ class FreshRSS_Category extends Minz_Model { $this->id = $value; } public function _name ($value) { - $this->name = $value; + $this->name = substr(trim($value), 0, 255); } public function _feeds ($values) { if (!is_array ($values)) { diff --git a/app/Models/Themes.php b/app/Models/Themes.php index 68fc17a2b..e3b260261 100644 --- a/app/Models/Themes.php +++ b/app/Models/Themes.php @@ -82,6 +82,7 @@ class FreshRSS_Themes extends Minz_Model { 'favorite' => '★', 'help' => 'ⓘ', 'icon' => '⊚', + 'import' => '⤓', 'key' => '⚿', 'link' => '↗', 'login' => '🔒', |