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/comments/persistence/cms_comments_storage_sql.e
+++ b/modules/comments/persistence/cms_comments_storage_sql.e
@@ -47,7 +47,7 @@ feature -- Access
 				sql_query (sql_select_comments_for_content, l_parameters)
 				sql_start
 			until
-				sql_after
+				sql_after or has_error
 			loop
 				if attached fetch_comment as obj then
 					Result.force (obj)