From: <var...@us...> - 2013-04-02 15:49:56
|
Revision: 8741 http://sourceforge.net/p/phpwiki/code/8741 Author: vargenau Date: 2013-04-02 15:49:52 +0000 (Tue, 02 Apr 2013) Log Message: ----------- Use HTML 5 DOCTYPE Modified Paths: -------------- trunk/configurator.php trunk/lib/ErrorManager.php trunk/lib/plugin/RecentChanges.php trunk/passencrypt.php trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Sidebar/templates/frame-left.tmpl trunk/themes/default/templates/htmldump.tmpl Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/configurator.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -159,13 +159,11 @@ IniConfig($fs_def_file); } -echo '<', '?xml version="1.0" encoding="utf-8"?', ">\n"; ?> -<!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> +<html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta charset="UTF-8" /> <title>Configuration tool for PhpWiki <?php echo $config_file ?></title> <style type="text/css" media="screen"> <!-- Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/lib/ErrorManager.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -269,12 +269,10 @@ // Handle it ourself. if ($error->isFatal()) { $this->_noCacheHeaders(); - echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; - echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"; - echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; + echo "<!DOCTYPE html>\n"; echo "<html>\n"; echo "<head>\n"; - echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"; + echo "<meta charset=\"UTF-8\" />\n"; echo "<title>Fatal Error</title>\n"; echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"themes/default/phpwiki.css\" />\n"; echo "</head>\n"; Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/lib/plugin/RecentChanges.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -733,12 +733,8 @@ global $request; $request->discardOutput(); - 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">'); - - printf("<head>\n"); + print("<!DOCTYPE html>\n"); + print("<head>\n"); extract($this->_args); if (!empty($category)) $title = $category; Modified: trunk/passencrypt.php =================================================================== --- trunk/passencrypt.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/passencrypt.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -1,9 +1,7 @@ -<?php echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"; ?> -<!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> +<html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> + <meta charset="UTF-8" /> <title>Password Encryption Tool</title> <!-- Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/themes/Crao/templates/htmldump.tmpl 2013-04-02 15:49:52 UTC (rev 8741) @@ -4,7 +4,7 @@ * mainly for the outer level <html> stuff and the and <head>. */ ?> -<!DOCTYPE> +<!DOCTYPE html> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/Sidebar/templates/frame-left.tmpl =================================================================== --- trunk/themes/Sidebar/templates/frame-left.tmpl 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/themes/Sidebar/templates/frame-left.tmpl 2013-04-02 15:49:52 UTC (rev 8741) @@ -3,7 +3,7 @@ * This template is responsible mainly for the outer level <html> stuff. */ ?> -<!DOCTYPE> +<!DOCTYPE html> <head> <meta charset="UTF-8" /> <?php echo Template('head') ?> Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/themes/default/templates/htmldump.tmpl 2013-04-02 15:49:52 UTC (rev 8741) @@ -4,11 +4,10 @@ * mainly for the outer level <html> stuff and the and <head>. */ ?> -<!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> +<html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<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?>" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |