From 70b91b8e25303a4ce111e458ad9239847f469337 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 19 Apr 2024 21:37:54 -0700
Subject: fix(scuttlizr): Unclosed div
This ‘div’ is opened on line 461.
---
data/templates/sscuttlizr/bookmarks.tpl.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/templates/sscuttlizr/bookmarks.tpl.php b/data/templates/sscuttlizr/bookmarks.tpl.php
index 1510d44..cb062a4 100644
--- a/data/templates/sscuttlizr/bookmarks.tpl.php
+++ b/data/templates/sscuttlizr/bookmarks.tpl.php
@@ -502,6 +502,7 @@ if ($currenttag!= '') {
include 'bookmarks-vote-horizontal.inc.tpl.php';
//echo " \n";
echo '
';
+ echo " \n";
echo " \n";
}
?>
--
cgit v1.2.3-54-g00ecf
From 971e5a78f97fa3f94633244196f455112c32a40c Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 19 Apr 2024 21:46:42 -0700
Subject: fix(scuttlizr): No named entity for non-breaking space in XHTML
While running in Debug mode XHTML is rendered instead of HTML, and XHTML doesn't
have a named entity for non-breaking space (‘ ’ in HTML), so the numeric
one must be used instead.
---
data/templates/sscuttlizr/importStructure.tpl.php | 10 +++++-----
data/templates/sscuttlizr/sidebar.linkedtags.inc.php | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/templates/sscuttlizr/importStructure.tpl.php b/data/templates/sscuttlizr/importStructure.tpl.php
index 9c54612..580330a 100644
--- a/data/templates/sscuttlizr/importStructure.tpl.php
+++ b/data/templates/sscuttlizr/importStructure.tpl.php
@@ -24,11 +24,11 @@ $this->includeTemplate($GLOBALS['top_include']);
- firstTagOfLevel1
- - firstTagOfLevel2 (the line starts with two spaces)
- - secondTagOfLevel2
- - thirdTagOfLevel2
+ - firstTagOfLevel2 (the line starts with two spaces)
+ - secondTagOfLevel2
+ - thirdTagOfLevel2
- secondTagOfLevel1
- - fourthTagOfLevel2 (included into secondTagOfLevel1)
+ - fourthTagOfLevel2 (included into secondTagOfLevel1)
@@ -39,4 +39,4 @@ $this->includeTemplate($GLOBALS['top_include']);
includeTemplate($GLOBALS['bottom_include']);
-?>
\ No newline at end of file
+?>
diff --git a/data/templates/sscuttlizr/sidebar.linkedtags.inc.php b/data/templates/sscuttlizr/sidebar.linkedtags.inc.php
index 020d0f0..aef00f0 100644
--- a/data/templates/sscuttlizr/sidebar.linkedtags.inc.php
+++ b/data/templates/sscuttlizr/sidebar.linkedtags.inc.php
@@ -28,7 +28,7 @@ function displayLinkedTags($tag, $linkType, $uId, $cat_url, $user, $editingMode
$output.= ' | ';
$output.= '';
$output.= $level == 1?'':'';
- $output.= str_repeat(' ', $level*2) .$link.''. filter($tag) .'';
+ $output.= str_repeat(' ', $level*2) .$link.''. filter($tag) .'';
$output.= $level == 1?'':'';
//$output.= ' - '. $tagstatservice->getMaxDepth($tag, $linkType, $uId);
--
cgit v1.2.3-54-g00ecf
From af40c6207ab74d511d80bcd5767fc60a256f0b98 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 19 Apr 2024 22:03:41 -0700
Subject: fix(debug): Don't serve application/xhtml+xml in debug mode
There are quite a few big differences between running HTML and XHTML that are
more than just validation errors. Running a different parser in debug mode seems
unhelpful, and the goal probably won't be to generate XHTML always anyway
anymore.
---
src/SemanticScuttle/header.php | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php
index 562ae43..bbe35bc 100644
--- a/src/SemanticScuttle/header.php
+++ b/src/SemanticScuttle/header.php
@@ -158,15 +158,7 @@ $tplVars['userservice'] = $userservice;
if (!defined('UNIT_TEST_MODE') || defined('HTTP_UNIT_TEST_MODE')) {
//API files define that, so we need a way to support both of them
if (!isset($httpContentType)) {
- if (DEBUG_MODE) {
- //using that mime type makes all javascript nice in Chromium
- // it also serves as test base if the pages really validate
- $httpContentType = 'application/xhtml+xml';
- } else {
- //until we are sure that all pages validate, we
- // keep the non-strict mode on for normal installations
- $httpContentType = 'text/html';
- }
+ $httpContentType = 'text/html';
}
if ($httpContentType !== false) {
header('Content-Type: ' . $httpContentType . '; charset=utf-8');
--
cgit v1.2.3-54-g00ecf
|