Merge branch 'release/v3.0.26' into support/v3.0

SIU-Toba · May 22, 2018 · 882d85e · 882d85e
2 parents 437e3cd + bbe88e1
commit 882d85e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 [CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop)
 
+[3.0.26](https://github.com/SIU-Toba/framework/releases/tag/v3.0.26) (2018-05-22):
+- Fix en toba_editor al verificar si se encuentra activo
+
 [3.0.25](https://github.com/SIU-Toba/framework/releases/tag/v3.0.25) (2018-05-16):
 - Bugfix a ef_multi_check al ser utilizado en un ei_filtro como campo obligatorio
 - Ordena la lista de metodos recuperados de una clase registrada como consulta_php

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.25
+3.0.26
diff --git a/php/nucleo/lib/toba_editor.php b/php/nucleo/lib/toba_editor.php
@@ -119,7 +119,7 @@ static function finalizar()
 	*/
 	static function activado()
 	{
-		if (count(self::$memoria)>0) {
+		if (is_array(self::$memoria) && count(self::$memoria)>0) {
 			return true;	
 		}
 		return false;