Merge branch 'debug-fixes' into oni

4 files changed, 8 insertions, 15 deletions

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 " </div>\n";
 		echo '<div class="qr-code"></div>';
+        echo "  </div>\n";
 		echo " </li>\n";
 	}
 	?>
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']);
 	<p><?php echo T_('Create your structure into a simple text file and following this model:');?></p>
 	<ul>
 		<li>firstTagOfLevel1</li>
-		<li>&nbsp;&nbsp;&nbsp;&nbsp;firstTagOfLevel2 <i>(the line starts with two spaces)</i></li>
-		<li>&nbsp;&nbsp;&nbsp;&nbsp;secondTagOfLevel2</li>
-		<li>&nbsp;&nbsp;&nbsp;&nbsp;thirdTagOfLevel2</li>
+		<li>&#160;&#160;&#160;&#160;firstTagOfLevel2 <i>(the line starts with two spaces)</i></li>
+		<li>&#160;&#160;&#160;&#160;secondTagOfLevel2</li>
+		<li>&#160;&#160;&#160;&#160;thirdTagOfLevel2</li>
 		<li>secondTagOfLevel1</li>
-		<li>&nbsp;&nbsp;&nbsp;&nbsp;fourthTagOfLevel2 <i>(included into secondTagOfLevel1)</i></li>
+		<li>&#160;&#160;&#160;&#160;fourthTagOfLevel2 <i>(included into secondTagOfLevel1)</i></li>
 	</ul>
 	</li>
 	<li>
@@ -39,4 +39,4 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 <?php
 $this->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.= '<td></td>';
     $output.= '<td>';
     $output.= $level ==  1?'<b>':'';
-    $output.= str_repeat('&nbsp;', $level*2) .$link.'<a href="'. sprintf($cat_url, filter($user, 'url'), filter($tag, 'url')) .'" rel="tag">'. filter($tag) .'</a>';
+    $output.= str_repeat('&#160;', $level*2) .$link.'<a href="'. sprintf($cat_url, filter($user, 'url'), filter($tag, 'url')) .'" rel="tag">'. filter($tag) .'</a>';
     $output.= $level ==  1?'</b>':'';
     //$output.= ' - '. $tagstatservice->getMaxDepth($tag, $linkType, $uId);
 
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');