xml compatibility fixes (mainly entities to unicode conversions)

9 files changed, 15 insertions, 14 deletions

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 1f88c6ff9..a0d2e430e 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -507,7 +507,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         if($item['type']=='d'){
             if($item['open']){
                 $img   = DOKU_BASE.'lib/images/minus.gif';
-                $alt   = '−';
+                $alt   = '−';
             }else{
                 $img   = DOKU_BASE.'lib/images/plus.gif';
                 $alt   = '+';
@@ -747,7 +747,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
             //build code
             $ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
-            $ret .= '<input '.buildAttributes($atts).' />&nbsp;';
+            $ret .= '<input '.buildAttributes($atts).' />&#160;';
             $ret .= $this->getLang('acl_perm'.$perm);
             $ret .= '</label>'.NL;
         }
@@ -783,7 +783,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '  <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
         echo '  <option value="__u__"  class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
         if (!empty($this->specials)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->specials as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
@@ -801,7 +801,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             echo '  </optgroup>'.NL;
         }
         if (!empty($this->usersgroups)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->usersgroups as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 9a9bb5329..c5f7ee532 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -118,6 +118,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
           // config setting group
           if ($in_fieldset) {
             ptln('  </table>');
+            ptln('  </div>');
             ptln('  </fieldset>');
           } else {
             $in_fieldset = true;
diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php
index ec97fe966..b01637dd1 100644
--- a/lib/plugins/config/lang/no/lang.php
+++ b/lib/plugins/config/lang/no/lang.php
@@ -43,8 +43,8 @@ $lang['_links']                = 'Innstillinger for lenker';
 $lang['_media']                = 'Innstillinger for mediafiler';
 $lang['_advanced']             = 'Avanserte innstillinger';
 $lang['_network']              = 'Nettverksinnstillinger';
-$lang['_plugin_sufix']         = '&ndash; innstillinger for tillegg';
-$lang['_template_sufix']       = '&ndash; innstillinger for mal';
+$lang['_plugin_sufix']         = '– innstillinger for tillegg';
+$lang['_template_sufix']       = '– innstillinger for mal';
 $lang['_msg_setting_undefined'] = 'Ingen innstillingsmetadata';
 $lang['_msg_setting_no_class'] = 'Ingen innstillingsklasse';
 $lang['_msg_setting_no_default'] = 'Ingen standard verdi';
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 1cdab607f..a1430016e 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -452,8 +452,8 @@ if (!class_exists('setting')) {
 
     function _out_key($pretty=false,$url=false) {
         if($pretty){
-            $out = str_replace(CM_KEYMARKER,"&raquo;",$this->_key);
-            if ($url && !strstr($out,'&raquo;')) {//provide no urls for plugins, etc.
+            $out = str_replace(CM_KEYMARKER,"»",$this->_key);
+            if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc.
                 if ($out == 'start') //one exception
                     return '<a href="http://www.dokuwiki.org/config:startpage">'.$out.'</a>';
                 else
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 2aaf1395f..ff5fa69ba 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -159,7 +159,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
             echo '</a> ';
 
             echo html_wikilink(':'.$recent['id'],(useHeading('navigation'))?NULL:$recent['id']);
-            echo ' &ndash; '.htmlspecialchars($recent['sum']);
+            echo ' – '.htmlspecialchars($recent['sum']);
 
             echo ' <span class="user">';
                 echo $recent['user'].' '.$recent['ip'];
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 8b646b426..2bb0a863d 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -153,7 +153,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("  <table class=\"inline\">");
         ptln("    <thead>");
         ptln("      <tr>");
-        ptln("        <th>&nbsp;</th><th>".$this->lang["user_id"]."</th><th>".$this->lang["user_name"]."</th><th>".$this->lang["user_mail"]."</th><th>".$this->lang["user_groups"]."</th>");
+        ptln("        <th>&#160;</th><th>".$this->lang["user_id"]."</th><th>".$this->lang["user_name"]."</th><th>".$this->lang["user_mail"]."</th><th>".$this->lang["user_groups"]."</th>");
         ptln("      </tr>");
 
         ptln("      <tr>");
diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 728887687..74aca9c06 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -119,7 +119,7 @@ dw_page = {
                 $handle.addClass('closed');
                 $handle.removeClass('open');
             }else{
-                $clicky.html('<span>&minus;</span>');
+                $clicky.html('<span>−</span>');
                 $handle.addClass('open');
                 $handle.removeClass('closed');
             }
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 3e85c58f2..9a14f29a2 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -61,7 +61,7 @@ if (!defined('DOKU_INC')) die();
 
       <div class="bar-right" id="bar__topright">
         <?php tpl_button('recent')?>
-        <?php tpl_searchform()?>&nbsp;
+        <?php tpl_searchform()?>&#160;
       </div>
 
       <div class="clearer"></div>
@@ -121,7 +121,7 @@ if (!defined('DOKU_INC')) die();
         <?php tpl_button('profile')?>
         <?php tpl_button('login')?>
         <?php tpl_button('index')?>
-        <?php tpl_button('top')?>&nbsp;
+        <?php tpl_button('top')?>&#160;
       </div>
       <div class="clearer"></div>
     </div>
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 0273e5678..4570f70f5 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -54,7 +54,7 @@ if ($ini) {
         echo '<td>'.htmlspecialchars($val).'</td>';
         echo '<td>';
         if(preg_match('/^#[0-f]{3,6}$/i',$val)){
-            echo '<div class="color" style="background-color:'.$val.';">&nbsp;</div>';
+            echo '<div class="color" style="background-color:'.$val.';">&#160;</div>';
         }
         echo '</td>';
         echo '</tr>';