From 33ed4c75fc932cafd701d47d3d58f6e68f5c2e2b Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Sat, 13 Jul 2019 11:54:46 +0200
Subject: 1.2.6 Environnement update backtopbar always visible + minor fixes

---
 app/class/art2.php          | 2 +-
 app/class/controllerart.php | 2 +-
 app/class/model.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/class')

diff --git a/app/class/art2.php b/app/class/art2.php
index 2bd1138..81b6569 100644
--- a/app/class/art2.php
+++ b/app/class/art2.php
@@ -171,7 +171,7 @@ class Art2
 	public function description($type = 'string')
 	{
 		if($type == 'short' && strlen($this->description) > 15 ) {
-				return substr($this->description, 0, 15) . '.';
+				return substr($this->description, 0, 20) . '...';
 		} else {
 			return $this->description;
 		}
diff --git a/app/class/controllerart.php b/app/class/controllerart.php
index ce742a1..f8155ea 100644
--- a/app/class/controllerart.php
+++ b/app/class/controllerart.php
@@ -171,7 +171,7 @@ class Controllerart extends Controller
             }
             $fonts = [];
 
-            $this->showtemplate('edit', ['art' => $this->art, 'artexist' => true, 'tablist' => $tablist, 'artlist' => $idlist, 'showleftpanel' => $showleftpanel, 'showrightpanel' => $showrightpanel, 'fonts' => $fonts, 'tagartlist' => $tagartlist, 'lasteditedartlist' => $lasteditedartlist, 'faviconlist' => $faviconlist, 'editorlist' => $editorlist]);
+            $this->showtemplate('edit', ['art' => $this->art, 'artexist' => true, 'tablist' => $tablist, 'artlist' => $idlist, 'showleftpanel' => $showleftpanel, 'showrightpanel' => $showrightpanel, 'fonts' => $fonts, 'tagartlist' => $tagartlist, 'lasteditedartlist' => $lasteditedartlist, 'faviconlist' => $faviconlist, 'editorlist' => $editorlist, 'user' => $this->user]);
         } else {
             $this->routedirect('artread/', ['art' => $this->art->id()]);
         }
diff --git a/app/class/model.php b/app/class/model.php
index b514b00..2b222ec 100644
--- a/app/class/model.php
+++ b/app/class/model.php
@@ -17,7 +17,7 @@ abstract class Model
 	const MEDIA_EXTENSIONS = array('jpeg', 'jpg', 'JPG', 'png', 'gif', 'mp3', 'mp4', 'mov', 'wav', 'flac', 'pdf');
 	const MEDIA_TYPES = ['image', 'video', 'sound', 'other'];
 
-	const COLUMNS = ['title', 'description', 'tag', 'date', 'datemodif', 'datecreation', 'secure', 'linkfrom', 'linkto', 'visitcount', 'affcount', 'editcount'];
+	const COLUMNS = ['id', 'title', 'description', 'tag', 'date', 'datemodif', 'datecreation', 'secure', 'linkfrom', 'linkto', 'visitcount', 'affcount', 'editcount'];
 
 	const TEXT_ELEMENTS = ['header', 'nav', 'main', 'aside', 'footer'];
 	const EDIT_SYMBOLS = ['pen', 'tool', 'none'];
-- 
cgit v1.2.3