Merge branch 'master' into es17.01

2017-03-03 18:53:33 +01:00
parent c7222d5fcc 7cde24a439
commit 4dcd2693e3
10 changed files with 29 additions and 25 deletions
--- a/modules/taxonomy/persistence/cms_taxonomy_storage_sql.e
+++ b/modules/taxonomy/persistence/cms_taxonomy_storage_sql.e
@@ -43,7 +43,7 @@ feature -- Access
 				sql_query (sql_select_terms, l_parameters)
 				sql_start
 			until
-				sql_after
+				sql_after or has_error
 			loop
 				if attached fetch_term as l_term then
 					Result.force (create {CMS_VOCABULARY}.make_from_term (l_term))
@@ -93,7 +93,7 @@ feature -- Access
 --				sql_query (sql_select_terms_with_range, l_parameters)			
 				sql_start
 			until
-				sql_after
+				sql_after or has_error
 			loop
 				if attached fetch_term as l_term then
 					Result.force (l_term)