Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

3 files changed, 2 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index f77cd2a80..520cf464a 100644
--- a/boot.php
+++ b/boot.php
@@ -2428,7 +2428,6 @@ function construct_page() {
 			'style-src'  => [ "'self'", "'unsafe-inline'" ],
 			'frame-src'  => [ "'self'" ]
 		];
-
 		call_hooks('content_security_policy',$cspsettings);
 
 		// Legitimate CSP directives (cxref: https://content-security-policy.com/)
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index f77a1906c..097656a6c 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_es_es")) {
 function string_plural_select_es_es($n){
-	return ($n != 1);
+	return (n != 1 ? 1 : 0);
 }}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)";
diff --git a/view/js/main.js b/view/js/main.js
index 0c48c8b18..16dcd9cfe 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1574,7 +1574,7 @@ $(window).scroll(function () {
 	}
 	else {
 		// This is some other kind of page - perhaps a directory
-		if($(window).scrollTop() + $(window).height() > $('#page-end').position().top) {
+		if($('#page-end').length && ($(window).scrollTop() + $(window).height() > $('#page-end').position().top)) {
 			if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
 				next_page++;
 				scroll_next = true;