[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 8808:3f7890e65f3a
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3f7890e65f3a
user: Tom <websitemaster at cogeco.net>
date: Fri Sep 07 12:55:25 2012 -0400
description:
Merged with upstream

diffstat:

 language/english.php                           |   2 +-
 language/english_utf-8.php                     |   2 +-
 public_html/admin/configuration_validation.php |   2 +-
 public_html/lib-common.php                     |  11 +++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diffs (71 lines):

diff -r abb8f51c7fc9 -r 3f7890e65f3a language/english.php
--- a/language/english.php	Fri Sep 07 12:33:50 2012 -0400
+++ b/language/english.php	Fri Sep 07 12:55:25 2012 -0400
@@ -2152,7 +2152,7 @@
     18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
     22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
     23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
     24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
diff -r abb8f51c7fc9 -r 3f7890e65f3a language/english_utf-8.php
--- a/language/english_utf-8.php	Fri Sep 07 12:33:50 2012 -0400
+++ b/language/english_utf-8.php	Fri Sep 07 12:55:25 2012 -0400
@@ -2152,7 +2152,7 @@
     18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
     22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
     23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
     24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
diff -r abb8f51c7fc9 -r 3f7890e65f3a public_html/admin/configuration_validation.php
--- a/public_html/admin/configuration_validation.php	Fri Sep 07 12:33:50 2012 -0400
+++ b/public_html/admin/configuration_validation.php	Fri Sep 07 12:55:25 2012 -0400
@@ -218,7 +218,7 @@
 );
 $_CONF_VALIDATE['Core']['doctype'] = array(
     'rule' => array('inList', array(
-        'html401strict', 'html401transitional', 'xhtml10strict', 'xhtml10transitional'
+        'html401strict', 'html401transitional', 'xhtml10strict', 'xhtml10transitional', 'html5', 'xhtml5'
     ), true)
 );
 $_CONF_VALIDATE['Core']['path_themes'] = array(
diff -r abb8f51c7fc9 -r 3f7890e65f3a public_html/lib-common.php
--- a/public_html/lib-common.php	Fri Sep 07 12:33:50 2012 -0400
+++ b/public_html/lib-common.php	Fri Sep 07 12:55:25 2012 -0400
@@ -365,6 +365,7 @@
     switch ($_CONF['doctype']) {
     case 'xhtml10transitional':
     case 'xhtml10strict':
+    case 'xhtml5':
         define('XHTML', ' /');
         break;
 
@@ -927,6 +928,11 @@
         $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
         break;
 
+    case 'html5':
+    case 'xhtml5':
+        $doctype = '<!DOCTYPE html>';
+        break;
+
     default: // fallback: HTML 4.01 Transitional w/o system identifier
         $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
         break;
@@ -1638,6 +1644,11 @@
         $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
         break;
 
+    case 'html5':
+    case 'xhtml5':
+        $doctype = '<!DOCTYPE html>';
+        break;
+
     default: // fallback: HTML 4.01 Transitional w/o system identifier
         $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
         break;