From b290209a41ded4c65a9db3e75cdab832bbb89a73 Mon Sep 17 00:00:00 2001
From: Dimo  Belov <d_belov@outlook.com>
Date: Tue, 10 Jul 2018 11:37:56 +0300
Subject: [PATCH] Other fixes

---
 bl-kernel/abstract/dblist.class.php | 10 ++++++++--
 bl-kernel/category.class.php        |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bl-kernel/abstract/dblist.class.php b/bl-kernel/abstract/dblist.class.php
index 0cc953ea..76bba0bf 100644
--- a/bl-kernel/abstract/dblist.class.php
+++ b/bl-kernel/abstract/dblist.class.php
@@ -44,6 +44,10 @@ class dbList extends dbJSON
 			return $list;
 		}
 
+        if (count($list) < $amountOfItems) {			
+			return $list;
+		}
+
 		// The first page number is 1, so the real is 0
 		$realPageNumber = $pageNumber - 1;
 		$chunks = array_chunk($list, $realPageNumber);
@@ -94,9 +98,11 @@ class dbList extends dbJSON
 	// $args => 'name', 'oldkey', 'newKey', 'template'
 	public function edit($args)
 	{
-		if (isset($this->db[$args['newKey']])) {
+
+        if (isset($this->db[$args['newKey']])) {
 			Log::set(__METHOD__.LOG_SEP.'The new key already exists. Key: '.$args['newKey']);
-			return false;
+            //this not allow to edit existing category
+			//return false;
 		}
 
 		$this->db[$args['newKey']]['name'] 	= $args['name'];
diff --git a/bl-kernel/category.class.php b/bl-kernel/category.class.php
index 2a09d95b..89aebbca 100644
--- a/bl-kernel/category.class.php
+++ b/bl-kernel/category.class.php
@@ -10,7 +10,10 @@ class Category {
 
 		if (isset($dbCategories->db[$key])) {
 			$this->vars['name'] 		= $dbCategories->db[$key]['name'];
-			$this->vars['template'] 	= $dbCategories->db[$key]['template'];
+            //here i recieve error from old category structure where template is not exist. 
+            if(isset($dbCategories->db[$key]['template'])){
+			  $this->vars['template'] 	= $dbCategories->db[$key]['template'];
+            }
 			$this->vars['key'] 		= $key;
 			$this->vars['permalink'] 	= DOMAIN_CATEGORIES . $key;
 			$this->vars['list'] 		= $dbCategories->db[$key]['list'];