phpwiki-checkins Mailing List for PhpWiki (Page 99)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8739
          http://sourceforge.net/p/phpwiki/code/8739
Author:   vargenau
Date:     2013-04-02 13:51:35 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Use HTML 5 DOCTYPE; force CHARSET=utf-8

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/IniConfig.php
    trunk/lib/MailNotify.php
    trunk/lib/RssWriter.php
    trunk/lib/Template.php
    trunk/lib/WikiDB/backend/ADODB_mysql.php
    trunk/lib/WikiDB/backend/PDO_mysql.php
    trunk/lib/WikiDB/backend/PearDB_mysql.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/LDAP.php
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/XmlElement.php
    trunk/lib/XmlParser.php
    trunk/lib/config.php
    trunk/lib/display.php
    trunk/lib/editpage.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/GooglePlugin.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/WikiForm.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/_WikiTranslation.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php
    trunk/lib/ziplib.php
    trunk/pgsrc/Help%2FTextFormattingRules
    trunk/tests/unit/test.php
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Sidebar/templates/frame-left.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/signin.tmpl
    trunk/themes/default/templates/addcomment.tmpl
    trunk/themes/default/templates/dialog.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/default/templates/forumadd.tmpl
    trunk/themes/default/templates/login.tmpl
    trunk/themes/default/templates/redirect.tmpl
    trunk/themes/default/templates/wikiforum.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl
    trunk/themes/wikilens/templates/head.tmpl

Modified: trunk/config/config-default.ini
===================================================================

--- trunk/config/config-default.ini	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/config/config-default.ini	2013-04-02 13:51:35 UTC (rev 8739)
@@ -128,7 +128,6 @@
 
 THEME = Sidebar
 ; DEFAULT_LANGUAGE = 
-CHARSET = utf-8
 WIKI_PGSRC = pgsrc
 DEFAULT_WIKI_PGSRC = pgsrc
 ; untranslated pgsrc pages to always include

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/config/config-dist.ini	2013-04-02 13:51:35 UTC (rev 8739)
@@ -904,33 +904,6 @@
 ; random heavy images:
 ;THEME = Hawaiian
 
-; Select a valid charset name to be inserted into the xml/html pages,
-; and to reference links to the stylesheets (css). For more info see:
-; http://www.iana.org/assignments/character-sets. Note that PhpWiki
-; has been extensively tested only with the latin1 (iso-8859-1)
-; and utf-8 character sets.
-;
-; If you change the default with existing pages, 
-; PhpWiki may not work properly and will require modifications in all existing pages. 
-; You'll have to dump the old pages with the old charset
-; and import it into the new one after having changed the charset.
-; Currently we support utf-8 for all languages, euc-jp for ja
-; and iso-8859-1 for all langs except ja and zh. Changing languages (UserPreferences) 
-; from one charset to another will not work!
-;
-; Character sets similar to iso-8859-1 may work with little or no
-; modification depending on your setup. The database must also
-; support the same charset, and of course the same is true for the
-; web browser. euc-jp and utf-8 works ok, but only is mbstring is used.
-CHARSET = utf-8
-
-; Most exotic charsets are not supported by htmlspecialchars, which prints a warning:
-; "charset `bla' not supported, assuming iso-8859-1"
-; Even on simple 8bit charsets, where just <>& need to be replaced.
-; See php-src:/ext/standard/html.c
-; We can ignore these warnings then.
-;IGNORE_CHARSET_NOT_SUPPORTED_WARNING = true
-
 ; Select your language/locale - Default language is "" for auto-detection.
 ; Available languages:
 ; English  "en" (English    - HomePage)
@@ -945,7 +918,6 @@
 ;
 ; If you set DEFAULT_LANGUAGE to the empty string, the users 
 ; preferred language as determined by the browser setting will be used.
-; Japanese and Chinese require CHARSET=utf-8
 ;DEFAULT_LANGUAGE = en
 
 ; WIKI_PGSRC -- specifies the source for the initial page contents of

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/configurator.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -1333,12 +1333,6 @@
   THEME = blog     (Kubrick)   [experimental]
 </pre>");
 
-$properties["Character Set"] =
-    new _define_optional('CHARSET', 'utf-8');
-
-$properties["Ignore Charset Not Supported Warning"] =
-    new _define_optional('IGNORE_CHARSET_NOT_SUPPORTED_WARNING');
-
 $properties["Language"] =
     new _define_selection_optional('DEFAULT_LANGUAGE',
         array('en' => "English",

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/IniConfig.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -47,7 +47,7 @@
  *   (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...)
  *   Use one global $phpwiki object instead which holds the cfg vars, constants
  *   and all other globals.
- *     (global $FieldSeparator, $charset, $WikiNameRegexp, $KeywordLinkRegexp;
+ *     (global $FieldSeparator, $WikiNameRegexp, $KeywordLinkRegexp;
  *      global $DisabledActions, $DBParams, $LANG, $AllActionPages)
  *
  * - Resurrect the larger "config object" code (in config/) so it'll aid the
@@ -129,7 +129,6 @@
     if (!file_exists($file)) {
         // We need to DATA_PATH for configurator, or pass the posted values
         // somewhow to the script
-        $GLOBALS['charset'] = 'utf-8';
         include_once(dirname(__FILE__) . "/install.php");
         run_install("_part1");
         if (!defined("_PHPWIKI_INSTALL_RUNNING"))
@@ -147,7 +146,7 @@
         'COOKIE_EXPIRATION_DAYS', 'COOKIE_DOMAIN',
         'PASSWORD_LENGTH_MINIMUM', 'USER_AUTH_POLICY',
         'GROUP_METHOD',
-        'EDITING_POLICY', 'THEME', 'CHARSET',
+        'EDITING_POLICY', 'THEME',
         'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
         'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/
         // extra logic:
@@ -572,7 +571,6 @@
 
 function _ignore_unknown_charset_warning(&$error)
 {
-    //htmlspecialchars(): charset `iso-8859-2' not supported, assuming iso-8859-1
     if (preg_match('/^htmlspecialchars\(\): charset \`.+\' not supported, assuming iso-8859-1/',
         $error->errstr)
     ) {
@@ -585,36 +583,14 @@
 // moved from lib/config.php [1ms]
 function fixup_static_configs($file)
 {
-    global $FieldSeparator, $charset, $WikiNameRegexp, $AllActionPages;
+    global $FieldSeparator, $WikiNameRegexp, $AllActionPages;
     global $DBParams, $LANG, $ErrorManager;
     // init FileFinder to add proper include paths
     FindFile("lib/interwiki.map", true);
 
-    // "\x80"-"\x9f" (and "\x00" - "\x1f") are non-printing control
-    // chars in iso-8859-*
-    // $FieldSeparator = "\263"; // this is a superscript 3 in ISO-8859-1.
     // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8
-    // Get rid of constant. pref is dynamic and language specific
-    $charset = CHARSET;
-    // Disabled: Let the admin decide which charset.
-    //if (isset($LANG) and in_array($LANG,array('zh')))
-    //    $charset = 'utf-8';
-    if (strtolower($charset) == 'utf-8')
-        $FieldSeparator = "\xFF";
-    else
-        $FieldSeparator = "\x81";
+    $FieldSeparator = "\xFF";
 
-    // Some exotic charsets are not supported by htmlspecialchars, which just prints an E_WARNING.
-    // Even on simple 8bit charsets, where just <>& need to be replaced. For iso-8859-[2-4] e.g.
-    // See <php-src>/ext/standard/html.c
-    // For performance reasons we require a magic constant to ignore this warning.
-    if (defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING')
-        and IGNORE_CHARSET_NOT_SUPPORTED_WARNING
-    ) {
-        $ErrorManager->pushErrorHandler
-        (new WikiFunctionCb('_ignore_unknown_charset_warning'));
-    }
-
     // All pages containing plugins of the same name as the filename
     $ActionPages = explode(':',
         'AllPages:AllUsers:AppendText:AuthorHistory:'
@@ -995,8 +971,6 @@
             }
         }
         // tell gettext not to use unicode. PHP >= 4.2.0. Thanks to Kai Krakow.
-        if (defined('CHARSET') and function_exists('bind_textdomain_codeset'))
-            @bind_textdomain_codeset("phpwiki", CHARSET);
         if ($LANG != 'en')
             textdomain("phpwiki");
         if ($chback) { // change back

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/MailNotify.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -203,7 +203,7 @@
         $headers = "From: $from\r\n" .
             "Bcc: " . join(',', $emails) . "\r\n" .
             "MIME-Version: 1.0\r\n" .
-            "Content-Type: text/plain; charset=" . CHARSET . "; format=flowed\r\n" .
+            "Content-Type: text/plain; charset=UTF-8; format=flowed\r\n" .
             "Content-Transfer-Encoding: 8bit";
 
         $ok = mail(($to = array_shift($emails)),

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/RssWriter.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -3,10 +3,6 @@
  * Code for creating RSS 1.0.
  */
 
-// Encoding for RSS output.
-if (!defined('RSS_ENCODING'))
-    define('RSS_ENCODING', $GLOBALS['charset']);
-
 /**
  * A class for writing RSS 1.0.
  *

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/Template.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -145,7 +145,7 @@
         if (!isset($revision))
             $revision = false;
 
-        global $WikiTheme, $charset;
+        global $WikiTheme;
         //$this->_dump_template();
         $SEP = $WikiTheme->getButtonSeparator();
 

Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -50,16 +50,7 @@
 
         // esp. needed for utf databases
         if ($this->_serverinfo['version'] > 401.0) {
-            global $charset;
-            $aliases = array('iso-8859-1' => 'latin1',
-                'utf-8' => 'utf8');
-            //http://dev.mysql.com/doc/mysql/en/charset-connection.html
-            if (isset($aliases[strtolower($charset)])) {
-                // mysql needs special unusual names and doesn't resolve aliases
-                mysql_query("SET NAMES '" . $aliases[$charset] . "'");
-            } else {
-                mysql_query("SET NAMES '$charset'");
-            }
+            mysql_query("SET NAMES 'UTF-8'");
         }
     }
 

Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -44,16 +44,7 @@
         }
 
         if ($this->_serverinfo['version'] > 401.0) {
-            global $charset;
-            $aliases = array('iso-8859-1' => 'latin1',
-                'utf-8' => 'utf8');
-            //http://dev.mysql.com/doc/mysql/en/charset-connection.html
-            if (isset($aliases[strtolower($charset)])) {
-                // mysql needs special unusual names and doesn't resolve aliases
-                mysql_query("SET NAMES '" . $aliases[$charset] . "'");
-            } else {
-                mysql_query("SET NAMES '$charset'");
-            }
+            mysql_query("SET NAMES 'UTF-8'");
         }
     }
 

Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -29,16 +29,7 @@
             }
             // esp. needed for utf databases
             if ($this->_serverinfo['version'] > 401.0) {
-                global $charset;
-                $aliases = array('iso-8859-1' => 'latin1',
-                    'utf-8' => 'utf8');
-                //http://dev.mysql.com/doc/mysql/en/charset-connection.html
-                if (isset($aliases[strtolower($charset)])) {
-                    // mysql needs special unusual names and doesn't resolve aliases
-                    mysql_query("SET NAMES '" . $aliases[strtolower($charset)] . "'");
-                } else {
-                    mysql_query("SET NAMES '$charset'");
-                }
+                mysql_query("SET NAMES 'UTF-8'");
             }
         }
     }

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WikiPlugin.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -292,7 +292,7 @@
         $form = HTML::form(array('action' => WikiURL($args['targetpage']),
             'method' => $args['method'],
             'class' => $args['class'],
-            'accept-charset' => $GLOBALS['charset']));
+            'accept-charset' => 'UTF-8'));
         if (!USE_PATH_INFO) {
             $pagename = $request->get('pagename');
             $form->pushContent(HTML::input(array('type' => 'hidden',

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WikiTheme.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -1137,7 +1137,6 @@
             return HTML();
         $link = HTML::link(array('rel' => $is_alt ? 'alternate stylesheet' : 'stylesheet',
             'type' => 'text/css',
-            'charset' => $GLOBALS['charset'],
             'href' => $this->_findData($css_file)));
         if ($is_alt)
             $link->setAttr('title', $title);

Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WikiUser/LDAP.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -188,7 +188,6 @@
                 // On wrong password the ldap server will return:
                 // "Unable to bind to server: Server is unwilling to perform"
                 // The @ catches this error message.
-                // If CHARSET=utf-8 the form should have already converted it to utf-8.
                 if ($r = @ldap_bind($ldap, $dn, $submitted_password)) {
                     // ldap_bind will return TRUE if everything matches
                     // Optionally get the mail from LDAP

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -164,24 +164,12 @@
 
     function replace_inside_html()
     {
-        global $charset;
-
         $this->clean_links();
         $this->clean_plugin_name();
         $this->replace_known_plugins();
         $this->replace_unknown_plugins();
         // $this->replace_tags();
         $this->clean_plugin();
-
-        if ($charset != 'utf-8') {
-            if ($charset == 'iso-8959-1') {
-                $this->_html = utf8_decode($this->_html);
-            } else {
-                // check for iconv support
-                loadPhpExtension("iconv");
-                $this->_html = iconv("UTF-8", $charset, $this->_html);
-            }
-        }
         $this->html_content = $this->_html;
     }
 

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/XmlElement.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -195,7 +195,7 @@
     function _quote($string)
     {
         if (!$string) return $string;
-        return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']);
+        return htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
     }
 }
 
@@ -570,13 +570,7 @@
 function XmlContent_quote($string)
 {
     if (!$string) return $string;
-    if (isset($GLOBALS['charset'])
-        and (!defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') or !IGNORE_CHARSET_NOT_SUPPORTED_WARNING)
-    ) {
-        return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']);
-    } else {
-        return htmlspecialchars($string);
-    }
+    return htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
 }
 
 function PrintXML($val /* , ... */)

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/XmlParser.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -59,7 +59,7 @@
         else
             $this->_parser = xml_parser_create();
 
-        xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['charset']);
+        xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
 
         //This unfortunately does not work
         //xml_set_object($this->_parser, &$this);

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/config.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -216,7 +216,7 @@
         if ($res = setlocale($category, $try))
             return $res;
         // Try with charset appended...
-        $try = $try . '.' . $GLOBALS['charset'];
+        $try = $try . '.' . 'UTF-8';
         if ($res = setlocale($category, $try))
             return $res;
         foreach (array(".", '@', '_') as $sep) {
@@ -287,7 +287,7 @@
     // FIXME: Not all environments may support en_US?  We should probably
     // have a list of locales to try.
     if (setlocale(LC_CTYPE, 0) == 'C') {
-        $x = setlocale(LC_CTYPE, 'en_US.' . $GLOBALS['charset']);
+        $x = setlocale(LC_CTYPE, 'en_US.UTF-8');
     } else {
         $x = setlocale(LC_CTYPE, $setlocale);
     }

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/display.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -119,7 +119,7 @@
             ));
         $html = GeneratePageAsXML($template, $pagename, $revision /*,
                   array('VALID_LINKS' => $args['VALID_LINKS'])*/);
-        header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
+        header("Content-Type: application/xhtml+xml; charset=UTF-8");
         echo $html;
     } else {
         $pagelist = null;
@@ -237,9 +237,8 @@
     }
     $format = $request->getArg('format');
     if ($format == 'xml') { // fast ajax: include page content asynchronously
-        global $charset;
         header("Content-Type: text/xml");
-        echo "<", "?xml version=\"1.0\" encoding=\"$charset\"?", ">\n";
+        echo "<", "?xml version=\"1.0\" encoding=\"UTF-8\"?", ">\n";
         // DOCTYPE html needed to allow unencoded entities like &nbsp; without !CDATA[]
         echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', "\n";
@@ -309,18 +308,6 @@
 
     $request->appendValidators(array('pagerev' => $revision->getVersion(),
         '%mtime' => $revision->get('mtime')));
-    /*
-        // FIXME: This is also in the template...
-        if ($request->getArg('action') != 'pdf' and !headers_sent()) {
-          // FIXME: enable MathML/SVG/... support
-          if (ENABLE_XHTML_XML
-                 and (!isBrowserIE()
-                      and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')))
-                header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
-            else
-                header("Content-Type: text/html; charset=" . $GLOBALS['charset']);
-        }
-    */
 
     $toks['TITLE'] = $pagetitle; // <title> tag
     $toks['HEADER'] = $pageheader; // h1 with backlink

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/editpage.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -64,7 +64,7 @@
             }
         }
         if (!headers_sent())
-            header("Content-Type: text/html; charset=" . $GLOBALS['charset']);
+            header("Content-Type: text/html; charset=UTF-8");
     }
 
     function editPage()

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/loadsave.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -1237,13 +1237,6 @@
                 break;
         }
     }
-    if (empty($pagehash['charset']))
-        $pagehash['charset'] = 'utf-8';
-    // compare to target charset
-    if (strtolower($pagehash['charset']) != strtolower($GLOBALS['charset'])) {
-        $pageinfo['content'] = charset_convert($params['charset'], $GLOBALS['charset'], $pageinfo['content']);
-        $pageinfo['pagename'] = charset_convert($params['charset'], $GLOBALS['charset'], $pageinfo['pagename']);
-    }
     return $pageinfo;
 }
 
@@ -1282,9 +1275,6 @@
     if (!$mtime)
         $mtime = time(); // Last resort.
 
-    // DONE: check source - target charset for content and pagename
-    // but only for pgsrc'ed content, not from the browser.
-
     $default_pagename = rawurldecode($basename);
     if (($parts = ParseMimeifiedPages($text))) {
         if (count($parts) > 1)
@@ -1311,13 +1301,6 @@
         // plain old file
         $user = $request->getUser();
 
-        $file_charset = 'utf-8';
-        // compare to target charset
-        if ($file_charset != strtolower($GLOBALS['charset'])) {
-            $text = charset_convert($file_charset, $GLOBALS['charset'], $text);
-            $default_pagename = charset_convert($file_charset, $GLOBALS['charset'], $default_pagename);
-        }
-
         // Assume plain text file.
         $pageinfo = array('pagename' => $default_pagename,
             'pagedata' => array(),

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/EditMetaData.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -146,7 +146,7 @@
             $button = Button('submit:metaedit', _("Submit"), false);
             $form = HTML::form(array('action' => $action,
                     'method' => 'post',
-                    'accept-charset' => $GLOBALS['charset']),
+                    'accept-charset' => 'UTF-8'),
                 $hiddenfield,
                 // edit existing fields
                 $table,

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/ExternalSearch.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -108,7 +108,7 @@
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post',
                 //'class'  => 'class', //fixme
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             HiddenInputs(array('pagename' => $basepage)));
 
         $form->pushContent(HTML::input(array('type' => 'hidden',

Modified: trunk/lib/plugin/GooglePlugin.php
===================================================================
--- trunk/lib/plugin/GooglePlugin.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/GooglePlugin.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -111,7 +111,7 @@
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post',
                 //'class'  => 'class', //fixme
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             HiddenInputs(array('pagename' => $basepage,
                 'mode' => $mode)));
         $form->pushContent(HTML::input(array('type' => 'text',

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/LinkDatabase.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -142,14 +142,14 @@
 
         } elseif ($args['format'] == 'xml') {
             // For hypergraph.jar. Best dump it to a local sitemap.xml periodically
-            global $WikiTheme, $charset;
+            global $WikiTheme;
             $currpage = $request->getArg('pagename');
             $request->discardOutput();
             $request->buffer_output(false);
             if (!headers_sent())
                 header("Content-Type: text/xml");
             $request->checkValidators();
-            echo "<?xml version=\"1.0\" encoding=\"$charset\"?>";
+            echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
             // As applet it prefers only "GraphXML.dtd", but then we must copy it to the webroot.
             $dtd = $WikiTheme->_findData("GraphXML.dtd");
             echo "<!DOCTYPE GraphXML SYSTEM \"$dtd\">\n";

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/LinkSearch.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -116,7 +116,7 @@
         $instructions = _("Search in pages for links with the matching name.");
         $form = HTML::form(array('action' => $action,
                 'method' => 'GET',
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             $dirsign_switch,
             $hiddenfield,
             $instructions, HTML::br(),

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/PageDump.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -123,16 +123,11 @@
             $filename = FilenameForPage($page);
             Header("Content-disposition: attachment; filename=\""
                 . $filename . "\"");
-            // Read charset from generated page itself.
-            // Inconsequential at the moment, since loadsave.php
-            // always generates headers.
-            $charset = $p->get('charset');
-            if (!$charset) $charset = $GLOBALS['charset'];
             // We generate 3 Content-Type headers! first in loadsave,
             // then here and the mimified string $mailified also has it!
             // This one is correct and overwrites the others.
             Header("Content-Type: application/octet-stream; name=\""
-                . $filename . "\"; charset=\"" . $charset
+                . $filename . "\"; charset=\"" . 'UTF-8'
                 . "\"");
             $request->checkValidators();
             // let $request provide last modified & etag

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/RecentChanges.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -733,7 +733,7 @@
         global $request;
         $request->discardOutput();
 
-        printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", $GLOBALS['charset']);
+        printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", 'UTF-8');
         printf('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"');
         printf('  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
         printf('<html xmlns="http://www.w3.org/1999/xhtml">');
@@ -860,7 +860,6 @@
         global $request;
         $request->discardOutput();
         $rss->finish();
-        //header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']);
         printf("\n<!-- Generated by PhpWiki-%s -->\n", PHPWIKI_VERSION);
 
         // Flush errors in comment, otherwise it's invalid XML.
@@ -980,7 +979,6 @@
         global $request;
         $request->discardOutput();
         $rss->finish();
-        //header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']);
         printf("\n<!-- Generated by PhpWiki-%s -->\n", PHPWIKI_VERSION);
         // Flush errors in comment, otherwise it's invalid XML.
         global $ErrorManager;
@@ -1060,7 +1058,6 @@
 
         $request->discardOutput();
         $rss->finish();
-        //header("Content-Type: application/atom; charset=" . $GLOBALS['charset']);
         printf("\n<!-- Generated by PhpWiki-%s -->\n", PHPWIKI_VERSION);
         // Flush errors in comment, otherwise it's invalid XML.
         global $ErrorManager;

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/RssFeed.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -54,10 +54,7 @@
     {
         extract($this->getArgs($argstr, $request));
 
-        if (defined('CHARSET'))
-            $rss_parser = new RSSParser(CHARSET);
-        else
-            $rss_parser = new RSSParser();
+        $rss_parser = new RSSParser();
 
         if (!empty($url))
             $rss_parser->parse_url($url, $debug);

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/SemanticSearch.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -142,7 +142,7 @@
         $instructions = _("Search in pages for a relation with that value (a pagename).");
         $form1 = HTML::form(array('action' => $action,
                 'method' => 'post',
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             $reldef,
             $hiddenfield, HiddenInputs(array('attribute' => '')),
             $instructions, HTML::br(),
@@ -225,7 +225,7 @@
             (HTML(" ", new Button(_("Advanced..."), _("SemanticSearchAdvanced"))));
         $form2 = HTML::form(array('action' => $action,
                 'method' => 'post',
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             $attdef,
             $hiddenfield, HiddenInputs(array('relation' => '')),
             $instructions, HTML::br(),

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -114,7 +114,7 @@
         $instructions = _("Search in all specified pages for the expression.");
         $form = HTML::form(array('action' => $action,
                 'method' => 'post',
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             $reldef,
             $hiddenfield, HiddenInputs(array('attribute' => '')),
             $instructions, HTML::br(),

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/SpellCheck.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -87,12 +87,11 @@
 
     function pspell_check($text, $lang = false)
     {
-        global $charset;
         if ($lang) $lang = $GLOBALS['LANG'];
         $words = preg_split('/[\W]+?/', $text);
 
         $misspelled = $return = array();
-        $pspell_config = pspell_config_create($lang, "", "", $charset,
+        $pspell_config = pspell_config_create($lang, "", "", 'UTF-8',
             PSPELL_NORMAL | PSPELL_RUN_TOGETHER);
         //pspell_config_runtogether($pspell_config, true);
         if (PSPELL_PWL)

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/SystemInfo.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -30,7 +30,7 @@
  *
  * Provide access to phpwiki's lower level system information.
  *
- *   version, charset, pagestats, SERVER_NAME, database, discspace,
+ *   version, pagestats, SERVER_NAME, database, discspace,
  *   cachestats, userstats, linkstats, accessstats, hitstats,
  *   revisionstats, interwikilinks, imageextensions, wikiwordregexp,
  *   availableplugins, downloadurl  or any other predefined CONSTANT

Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/WikiForm.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -54,7 +54,7 @@
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post',
                 'class' => 'wikiadmin',
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             HiddenInputs(array('action' => $action,
                 'overwrite' => $overwrite,
                 'pagename' => $basepage)));

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/WikiFormRich.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -181,7 +181,7 @@
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => strtolower($method),
                 'class' => 'wikiformrich',
-                'accept-charset' => $GLOBALS['charset']),
+                'accept-charset' => 'UTF-8'),
             HiddenInputs(array('action' => $action)));
         $nbsp = HTML::Raw('&nbsp;');
         $already_submit = 0;

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/plugin/_WikiTranslation.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -266,18 +266,6 @@
         } else {
             $languages = array($languages);
         }
-        if (in_array('zh', $languages) or in_array('ja', $languages)) {
-
-            // If the current charset != utf-8 the text will not be displayed correctly.
-            // But here we cannot change the header anymore. So we can decide to ignore them,
-            // or display them with all the errors.
-            //FIXME: do iconv the ob
-            if ($GLOBALS['charset'] != 'utf-8' and !defined('NEED_ICONV_TO')) {
-                define('NEED_ICONV_TO', 'utf-8');
-                //either the extension or external
-                //$GLOBALS['charset'] = 'utf-8';
-            }
-        }
         $to_lang = $languages[0];
         if (!empty($string) and count($languages) == 1) {
             return $this->translate($string, $to_lang, $from_lang);

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/stdlib.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -2086,47 +2086,10 @@
  */
 function fixTitleEncoding($s)
 {
-    global $charset;
-
-    $s = trim($s);
-    // print a warning?
-    if (empty($s)) return $s;
-
-    $ishigh = preg_match('/[\x80-\xff]/', $s);
-    /*
-    $isutf = ($ishigh ? preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
-                                    '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ) : true );
-    */
-    $isutf = ($ishigh ? isUtf8String($s) : true);
-    $locharset = strtolower($charset);
-
-    if ($locharset != "utf-8" and $ishigh and $isutf)
-        $s = charset_convert('UTF-8', $locharset, $s);
-    if ($locharset == "utf-8" and $ishigh and !$isutf)
-        return utf8_encode($s);
-
-    // Other languages can safely leave this function, or replace
-    // it with one to detect and convert another legacy encoding.
     return $s;
 }
 
 /**
- * MySQL fulltext index doesn't grok utf-8, so we
- * need to fold cases and convert to hex.
- * src: languages/Language.php:stripForSearch() from mediawiki
- */
-/*
-function stripForSearch( $string ) {
-    global $wikiLowerChars;
-    // '/(?:[a-z]|\xc3[\x9f-\xbf]|\xc4[\x81\x83\x85\x87])/' => "a-z\xdf-\xf6\xf8-\xff"
-    return preg_replace(
-                        "/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-                        "'U8' . bin2hex( strtr( \"\$1\", \$wikiLowerChars ) )",
-                        $string );
-}
-*/
-
-/**
  * Workaround for allow_url_fopen, to get the content of an external URI.
  * It returns the contents in one slurp. Parsers might want to check for allow_url_fopen
  * and use fopen, fread chunkwise. (see lib/XmlParser.php)

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/upgrade.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -608,9 +608,7 @@
                 ) {
                     echo _("OK"), "<br />\n";
                 } else {
-                    //SET CHARACTER SET latin1
-                    $charset = CHARSET;
-                    if ($charset == 'iso-8859-1') $charset = 'latin1';
+                    $charset = 'UTF-8';
                     $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
                         . "pagename VARCHAR(100) "
                         . "CHARACTER SET '$charset' COLLATE '$charset" . "_bin' NOT NULL");
@@ -772,7 +770,7 @@
         // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql.
         $form = HTML::form(array("method" => "post",
                 "action" => $this->request->getPostURL(),
-                "accept-charset" => $GLOBALS['charset']),
+                "accept-charset" => 'UTF-8'),
             HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."),
                 HTML::br(),
                 _("And on Windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/lib/ziplib.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -627,8 +627,6 @@
         //TODO: convert to multiple lines? acl-view => groups,...; acl-edit => groups,...
     }
 
-    $params['charset'] = $GLOBALS['charset'];
-
     // Non-US-ASCII is not allowed in Mime headers (at least not without
     // special handling) --- so we urlencode all parameter values.
     foreach ($params as $key => $val)
@@ -880,18 +878,6 @@
     else if ($encoding && $encoding != 'binary')
         ExitWiki(sprintf("Unknown %s", 'encoding type: $encoding'));
 
-    if (empty($params['charset']))
-        $params['charset'] = 'utf-8';
-
-    // compare to target charset
-    if (strtolower($params['charset']) != strtolower($GLOBALS['charset'])) {
-        $data = charset_convert($params['charset'], $GLOBALS['charset'], $data);
-        //$page['pagename'] = charset_convert($params['charset'], $GLOBALS['charset'], $page['pagename']);
-        if (isset($versiondata['summary']))
-            $versiondata['summary'] = charset_convert($params['charset'], $GLOBALS['charset'], $versiondata['summary']);
-
-    }
-
     $data .= GenerateFootnotesFromRefs($params);
 
     $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data));

Modified: trunk/pgsrc/Help%2FTextFormattingRules
===================================================================
--- trunk/pgsrc/Help%2FTextFormattingRules	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/pgsrc/Help%2FTextFormattingRules	2013-04-02 13:51:35 UTC (rev 8739)
@@ -1,4 +1,4 @@
-Date: Wed, 19 Dec 2012 13:19:04 +0000
+Date: Tue,  2 Apr 2013 15:43:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTextFormattingRules;
@@ -147,14 +147,6 @@
 
 All special non-whitespace HTML characters are displayed as-is. Exceptions below.
 
-Special non-ASCII or non-latin characters are printed as-is only if supported
-by the native wiki CHARSET. Add such characters on a non-supported CHARSET with the [[Help:RawHtmlPlugin]] if it is enabled by the Admin and e.g. the ##&#num;## syntax.
-
-E.g. These Japanese chars '&#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472;'
-on this <<SystemInfo CHARSET>> wiki.
-
-And with the plugin: <<RawHtml &#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472;>>
-
 == Paragraphs ==
 
 * Don't indent paragraphs

Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/tests/unit/test.php	2013-04-02 13:51:35 UTC (rev 8739)
@@ -358,7 +358,7 @@
         $form->pushContent(HTML::td($option));
     $table = HTML::form(array('action' => $_SERVER['PHP_SELF'],
                                           'method' => 'GET',
-                              'accept-charset' => $GLOBALS['charset']),
+                              'accept-charset' => 'UTF-8'),
                         $js,
                         HTML::table(HTML::tr(array('valign'=>'top'), $form)),
                         HTML::input(array('type' => 'submit')),

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Crao/templates/editpage.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -25,7 +25,7 @@
  */ ?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
   <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
   <br class="clear-floats" />

Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Crao/templates/head.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -1,5 +1,5 @@
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -3,13 +3,10 @@
  * This template is used only for html file dumps, and is responsible
  * mainly for the outer level <html> stuff and the and <head>.
  */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
+<meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
 <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Portland/templates/editpage.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -9,7 +9,7 @@
 
 <form method="post" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
 <table class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0">
 <tr align="bottom">

Modified: trunk/themes/Sidebar/templates/frame-left.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-left.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Sidebar/templates/frame-left.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -2,11 +2,10 @@
 /* 
  * This template is responsible mainly for the outer level <html> stuff.
  */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE>
+<head>
+<meta charset="UTF-8" />
 <?php echo Template('head') ?>
 <body>
 <div class="toolbar"><?php echo Template('navbar') ?></div>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -11,7 +11,7 @@
 <div class="wikitext" id="editform">
 <form method="post" name="editpage" id="editpage"
       action="<?php echo $request->getPostURL() ?>"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <table class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0">

Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/Wordpress/templates/signin.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -8,7 +8,7 @@
 ?>
 <?php if (empty($NOFORM)) { ?>
  <li>
-  <form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>" name="<?php echo $FORMNAME?>">
+  <form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php } ?>
 <?php

Modified: trunk/themes/default/templates/addcomment.tmpl
===================================================================
--- trunk/themes/default/templates/addcomment.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/addcomment.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -4,7 +4,7 @@
 <div class="wikicomment wikicomment-form">
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <form action="<?php echo $request->getPostURL()?>" method="post" class="wikiaction"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <input type="hidden" name="comment[pagename]" value="<?php echo $PAGENAME?>" />
   <?php echo HiddenInputs($request->getArgs()) ?>
   <table class="wikicomment-form">

Modified: trunk/themes/default/templates/dialog.tmpl
===================================================================
--- trunk/themes/default/templates/dialog.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/dialog.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -2,13 +2,10 @@
 /* 
  * A "popup" dialog.  (Though it does not pop up yet.)
  */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
+<meta charset="UTF-8" />
 <meta name="robots" content="noindex, nofollow" />
 <meta name="generator" content="phpWiki" />
 <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" />

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/editpage.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -27,7 +27,7 @@
  */ ?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
   <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
   <br class="clear-floats" />

Modified: trunk/themes/default/templates/forumadd.tmpl
===================================================================
--- trunk/themes/default/templates/forumadd.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/forumadd.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -3,7 +3,7 @@
 ?>
 <div class="wikiforum wikiforum-reply">
 <form action="<?php echo $request->getPostURL()?>" method="post" class="wikiaction"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <input type="hidden" name="forum[pagename]" value="<?php echo $PAGENAME?>" />
   <?php echo HiddenInputs($request->getArgs()) ?>
   <table class="wikiforum-reply">

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/login.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -60,7 +60,7 @@
   if (empty($pass_required)) ?>
   <p><?php echo _("New users may use an empty password.") ?></p>
 <?php } ?>
-<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo CHARSET?>" name="login">
+<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="login">
 <table>
 <tr>
 <td>

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/redirect.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -7,7 +7,7 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="robots" content="noindex, nofollow" />
 <meta name="generator" content="PhpWiki" />
 <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" />

Modified: trunk/themes/default/templates/wikiforum.tmpl
===================================================================
--- trunk/themes/default/templates/wikiforum.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/default/templates/wikiforum.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -12,7 +12,7 @@
 ?>
 <div class="wikiforum wikiforum-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" class="wikiaction"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <input type="hidden" name="forum[title]" value="<?php echo $FORUM_PARENT ?>" />
   <?php echo HiddenInputs($request->getArgs()) ?>
   <table class="wikiforum wikiforum-list">

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -60,7 +60,7 @@
 
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
-      accept-charset="<?php echo CHARSET?>">
+      accept-charset="UTF-8">
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
   <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
   <br class="clear-floats" />

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2013-04-02 10:14:58 UTC (rev 8738)
+++ trunk/themes/wikilens/templates/head.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
@@ -1,5 +1,5 @@
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
+<meta charset="UTF-8" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

phpwiki-checkins Mailing List for PhpWiki (Page 99)

phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.