com web/php: Also remove XHTML from .inc files: include/header.inc include/layout.inc include/mozsearch.inc include/releases.inc
include/shared-manual.inc include/site.inc

Commit: 113c86286d163da2c16d66feea91519a1cc57892 Author: Michael <git@rvapps.org> Wed, 4 Jun 2014 19:50:50 +0200 Parents: 5bfef25e70e4e711d738704782e938f286a80e74 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=113c86286d163da2c16d66feea91519a1cc57892 Log: Also remove XHTML from .inc files Changed paths: M include/header.inc M include/layout.inc M include/mozsearch.inc M include/releases.inc M include/shared-manual.inc M include/site.inc Diff: diff --git a/include/header.inc b/include/header.inc index d3e014d..7d505cd 100644 --- a/include/header.inc +++ b/include/header.inc @@ -71,7 +71,7 @@ if (!isset($config["languages"])) { <?php endforeach ?> <!--[if lte IE 7]> - <link rel="stylesheet" type="text/css" href="<?php echo $MYSITE ?>styles/workarounds.ie7.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="<?php echo $MYSITE ?>styles/workarounds.ie7.css" media="screen"> <![endif]--> <!--[if lte IE 8]> @@ -81,7 +81,7 @@ if (!isset($config["languages"])) { <![endif]--> <!--[if lte IE 9]> - <link rel="stylesheet" type="text/css" href="<?php echo $MYSITE ?>styles/workarounds.ie9.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="<?php echo $MYSITE ?>styles/workarounds.ie9.css" media="screen"> <![endif]--> <!--[if IE]> diff --git a/include/layout.inc b/include/layout.inc index e3e7828..d6095c6 100644 --- a/include/layout.inc +++ b/include/layout.inc @@ -29,7 +29,7 @@ function highlight_php($code, $return = FALSE) $highlighted = '<div class="phpcode">' . str_replace( array( '&nbsp;', - '<br />', + '<br>', '<font color="', // for PHP 4 '<span style="color: ', // from PHP 5.0.0RC1 '</font>', @@ -39,7 +39,7 @@ function highlight_php($code, $return = FALSE) ), array( ' ', - "<br />\n", + "<br>\n", '<span class="', '<span class="', '</span>', @@ -72,12 +72,12 @@ function resize_image($img, $width = 1, $height = 1) // Return image with new width and height added return preg_replace( '!/?>$!', - sprintf(' height="%s" width="%s" />', $height, $width), + sprintf(' height="%s" width="%s">', $height, $width), $str ); } -// Return an <img /> tag for a given image file available on the server +// Return an <img> tag for a given image file available on the server function make_image($file, $alt = FALSE, $align = FALSE, $extras = FALSE, $dir = '/images', $border = 0, $addsize = TRUE) { @@ -102,7 +102,7 @@ function make_image($file, $alt = FALSE, $align = FALSE, $extras = FALSE, } // Return with image built up - return sprintf('<img src="%s/%s" alt="%s"%s%s%s />', + return sprintf('<img src="%s/%s" alt="%s"%s%s%s>', $webdir, $file, ($alt ? $alt : ''), @@ -112,7 +112,7 @@ function make_image($file, $alt = FALSE, $align = FALSE, $extras = FALSE, ); } -// Print an <img /> tag out for a given file +// Print an <img> tag out for a given file function print_image($file, $alt = FALSE, $align = FALSE, $extras = FALSE, $dir = '/images', $border = 0) { @@ -379,10 +379,10 @@ function display_event($event, $include_date = 1) <?php // Print long description - echo preg_replace("/\r?\n\r?\n/", "<br /><br />", trim(htmlentities($event['ldesc'],ENT_QUOTES | ENT_IGNORE, 'UTF-8'))); + echo preg_replace("/\r?\n\r?\n/", "<br><br>", trim(htmlentities($event['ldesc'],ENT_QUOTES | ENT_IGNORE, 'UTF-8'))); // If we have an URL, print it out if ($event['url']) { - echo '<br /><br /><b>URL:</b> ', + echo '<br><br><b>URL:</b> ', '<a href="', htmlentities($event['url'], ENT_QUOTES | ENT_IGNORE, 'UTF-8'), '">', htmlentities($event['url'], ENT_QUOTES | ENT_IGNORE, 'UTF-8'), '</a>'; } diff --git a/include/mozsearch.inc b/include/mozsearch.inc index ec30643..e638720 100644 --- a/include/mozsearch.inc +++ b/include/mozsearch.inc @@ -15,7 +15,7 @@ browserResultType="result" resultListStart="<!-- result list start -->" resultListEnd="<!-- result list end -->" - resultItemEnd="<br />" + resultItemEnd="<br>" > <browser diff --git a/include/releases.inc b/include/releases.inc index bb39062..2f0e771 100644 --- a/include/releases.inc +++ b/include/releases.inc @@ -3543,7 +3543,7 @@ $OLDRELEASES = array ( 'name' => 'PHP 4.4.7 zip package', 'md5' => '065e867fa3cfa75cba8271dde9b10cee', 'date' => '04 May 2007', - 'note' => 'This package was updated due to faulty Apache2 module shipped with the orginal.<br /> (CGI binary plus server API versions for Apache, Apache2 (experimental), ISAPI, NSAPI, Servlet and Pi3Web. MySQL support built-in, many extensions included, packaged as zip)<br />', + 'note' => 'This package was updated due to faulty Apache2 module shipped with the orginal.<br> (CGI binary plus server API versions for Apache, Apache2 (experimental), ISAPI, NSAPI, Servlet and Pi3Web. MySQL support built-in, many extensions included, packaged as zip)<br>', ), ), 'date' => '03 May 2007', diff --git a/include/shared-manual.inc b/include/shared-manual.inc index a7e281b..147fd6e 100644 --- a/include/shared-manual.inc +++ b/include/shared-manual.inc @@ -156,7 +156,7 @@ function manual_notes($notes) { '&amp;redirect=' . $_SERVER['BASE_HREF']; $addnotesnippet = make_link( $addnotelink, - "<img src='/images/notes-add@2x.png' alt='add a note' width='12' height='12' /> <small>add a note</small>" + "<img src='/images/notes-add@2x.png' alt='add a note' width='12' height='12'> <small>add a note</small>" ); $num_notes = count($notes); @@ -280,21 +280,21 @@ VOTEDIV; make_popup_link( 'https://master.php.net/manage/user-notes.php?action=edit+' . $id, - '<img src="/images/notes-edit@2x.png" height="12" width="12" alt="edit note" />', + '<img src="/images/notes-edit@2x.png" height="12" width="12" alt="edit note">', 'admin', 'scrollbars=yes,width=650,height=400' ) . "\n " . make_popup_link( 'https://master.php.net/manage/user-notes.php?action=reject+' . $id, - '<img src="/images/notes-reject@2x.png" height="12" width="12" alt="reject note" />', + '<img src="/images/notes-reject@2x.png" height="12" width="12" alt="reject note">', 'admin', 'scrollbars=no,width=300,height=200' ) . "\n " . make_popup_link( 'https://master.php.net/manage/user-notes.php?action=delete+' . $id, - '<img src="/images/notes-delete@2x.png" height="12" width="12" alt="delete note" />', + '<img src="/images/notes-delete@2x.png" height="12" width="12" alt="delete note">', 'admin', 'scrollbars=no,width=300,height=200' ) . "\n </span>"; diff --git a/include/site.inc b/include/site.inc index b3f8277..508fd62 100644 --- a/include/site.inc +++ b/include/site.inc @@ -229,7 +229,7 @@ function print_full_mirror_list($download_file = null, $direct_download = false) if (isset($groupped[$COUNTRY])) { print_mirror_box($COUNTRIES[$COUNTRY], $COUNTRY, $groupped[$COUNTRY], $download_file, $direct_download, true); - echo "<br />"; + echo "<br>"; } } foreach($groupped as $mirrorcode => $country) {