WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Perl-style comments should not be used 

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31079


git-svn-id: http://core.svn.wordpress.org/trunk@31060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-08 05:52:24 +00:00
parent e029005847
commit ac4e67b82e
5 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/ms.php
View File

@ -136,7 +136,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
$index = 0; $index = 0;
while ( $index < count( $stack ) ) { while ( $index < count( $stack ) ) {
# Get indexed directory from stack // Get indexed directory from stack
$dir = $stack[$index]; $dir = $stack[$index];
$dh = @opendir( $dir ); $dh = @opendir( $dir );

2
wp-includes/class-wp-xmlrpc-server.php
View File

@ -3634,7 +3634,7 @@ class wp_xmlrpc_server extends IXR_Server {
$formats = get_post_format_strings(); $formats = get_post_format_strings();
# find out if they want a list of currently supports formats // find out if they want a list of currently supports formats
if ( isset( $args[3] ) && is_array( $args[3] ) ) { if ( isset( $args[3] ) && is_array( $args[3] ) ) {
if ( $args[3]['show-supported'] ) { if ( $args[3]['show-supported'] ) {
if ( current_theme_supports( 'post-formats' ) ) { if ( current_theme_supports( 'post-formats' ) ) {

16
wp-includes/formatting.php
View File

@ -550,14 +550,14 @@ function seems_utf8($str) {
reset_mbstring_encoding(); reset_mbstring_encoding();
for ($i=0; $i < $length; $i++) { for ($i=0; $i < $length; $i++) {
$c = ord($str[$i]); $c = ord($str[$i]);
if ($c < 0x80) $n = 0; # 0bbbbbbb if ($c < 0x80) $n = 0; // 0bbbbbbb
elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
elseif (($c & 0xF0) == 0xE0) $n=2; # 1110bbbb elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
elseif (($c & 0xF8) == 0xF0) $n=3; # 11110bbb elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
elseif (($c & 0xFC) == 0xF8) $n=4; # 111110bb elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
elseif (($c & 0xFE) == 0xFC) $n=5; # 1111110b elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
else return false; # Does not match any model else return false; // Does not match any model
for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ? for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80)) if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
return false; return false;
} }

110
wp-includes/kses.php
View File

@ -672,7 +672,7 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
if (substr($string, 0, 1) != '<') if (substr($string, 0, 1) != '<')
return '&gt;'; return '&gt;';
# It matched a ">" character // It matched a ">" character
if ( '<!--' == substr( $string, 0, 4 ) ) { if ( '<!--' == substr( $string, 0, 4 ) ) {
$string = str_replace( array('<!--', '-->'), '', $string ); $string = str_replace( array('<!--', '-->'), '', $string );
@ -686,11 +686,11 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
$string = preg_replace('/-$/', '', $string); $string = preg_replace('/-$/', '', $string);
return "<!--{$string}-->"; return "<!--{$string}-->";
} }
# Allow HTML comments // Allow HTML comments
if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
return ''; return '';
# It's seriously malformed // It's seriously malformed
$slash = trim($matches[1]); $slash = trim($matches[1]);
$elem = $matches[2]; $elem = $matches[2];
@ -701,11 +701,11 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
if ( ! isset($allowed_html[strtolower($elem)]) ) if ( ! isset($allowed_html[strtolower($elem)]) )
return ''; return '';
# They are using a not allowed HTML element // They are using a not allowed HTML element
if ($slash != '') if ($slash != '')
return "</$elem>"; return "</$elem>";
# No attributes are allowed for closing elements // No attributes are allowed for closing elements
return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols ); return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
} }
@ -728,7 +728,7 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
* @return string Sanitized HTML element * @return string Sanitized HTML element
*/ */
function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) { function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
# Is there a closing XHTML slash at the end of the attributes? // Is there a closing XHTML slash at the end of the attributes?
if ( ! is_array( $allowed_html ) ) if ( ! is_array( $allowed_html ) )
$allowed_html = wp_kses_allowed_html( $allowed_html ); $allowed_html = wp_kses_allowed_html( $allowed_html );
@ -737,25 +737,25 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
if (preg_match('%\s*/\s*$%', $attr)) if (preg_match('%\s*/\s*$%', $attr))
$xhtml_slash = ' /'; $xhtml_slash = ' /';
# Are any attributes allowed at all for this element? // Are any attributes allowed at all for this element?
if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 ) if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
return "<$element$xhtml_slash>"; return "<$element$xhtml_slash>";
# Split it // Split it
$attrarr = wp_kses_hair($attr, $allowed_protocols); $attrarr = wp_kses_hair($attr, $allowed_protocols);
# Go through $attrarr, and save the allowed attributes for this element // Go through $attrarr, and save the allowed attributes for this element
# in $attr2 // in $attr2
$attr2 = ''; $attr2 = '';
$allowed_attr = $allowed_html[strtolower($element)]; $allowed_attr = $allowed_html[strtolower($element)];
foreach ($attrarr as $arreach) { foreach ($attrarr as $arreach) {
if ( ! isset( $allowed_attr[strtolower($arreach['name'])] ) ) if ( ! isset( $allowed_attr[strtolower($arreach['name'])] ) )
continue; # the attribute is not allowed continue; // the attribute is not allowed
$current = $allowed_attr[strtolower($arreach['name'])]; $current = $allowed_attr[strtolower($arreach['name'])];
if ( $current == '' ) if ( $current == '' )
continue; # the attribute is not allowed continue; // the attribute is not allowed
if ( strtolower( $arreach['name'] ) == 'style' ) { if ( strtolower( $arreach['name'] ) == 'style' ) {
$orig_value = $arreach['value']; $orig_value = $arreach['value'];
@ -770,10 +770,10 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
if ( ! is_array($current) ) { if ( ! is_array($current) ) {
$attr2 .= ' '.$arreach['whole']; $attr2 .= ' '.$arreach['whole'];
# there are no checks // there are no checks
} else { } else {
# there are some checks // there are some checks
$ok = true; $ok = true;
foreach ($current as $currkey => $currval) { foreach ($current as $currkey => $currval) {
if ( ! wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval) ) { if ( ! wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval) ) {
@ -783,11 +783,11 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
} }
if ( $ok ) if ( $ok )
$attr2 .= ' '.$arreach['whole']; # it passed them $attr2 .= ' '.$arreach['whole']; // it passed them
} # if !is_array($current) } // if !is_array($current)
} # foreach } // foreach
# Remove any "<" or ">" characters // Remove any "<" or ">" characters
$attr2 = preg_replace('/[<>]/', '', $attr2); $attr2 = preg_replace('/[<>]/', '', $attr2);
return "<$element$attr2$xhtml_slash>"; return "<$element$attr2$xhtml_slash>";
@ -816,13 +816,13 @@ function wp_kses_hair($attr, $allowed_protocols) {
$attrname = ''; $attrname = '';
$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action'); $uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
# Loop through the whole attribute list // Loop through the whole attribute list
while (strlen($attr) != 0) { while (strlen($attr) != 0) {
$working = 0; # Was the last operation successful? $working = 0; // Was the last operation successful?
switch ($mode) { switch ($mode) {
case 0 : # attribute name, href for instance case 0 : // attribute name, href for instance
if ( preg_match('/^([-a-zA-Z:]+)/', $attr, $match ) ) { if ( preg_match('/^([-a-zA-Z:]+)/', $attr, $match ) ) {
$attrname = $match[1]; $attrname = $match[1];
@ -832,9 +832,9 @@ function wp_kses_hair($attr, $allowed_protocols) {
break; break;
case 1 : # equals sign or valueless ("selected") case 1 : // equals sign or valueless ("selected")
if (preg_match('/^\s*=\s*/', $attr)) # equals sign if (preg_match('/^\s*=\s*/', $attr)) // equals sign
{ {
$working = 1; $working = 1;
$mode = 2; $mode = 2;
@ -842,7 +842,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
break; break;
} }
if (preg_match('/^\s+/', $attr)) # valueless if (preg_match('/^\s+/', $attr)) // valueless
{ {
$working = 1; $working = 1;
$mode = 0; $mode = 0;
@ -854,10 +854,10 @@ function wp_kses_hair($attr, $allowed_protocols) {
break; break;
case 2 : # attribute value, a URL after href= for instance case 2 : // attribute value, a URL after href= for instance
if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
# "value" // "value"
{ {
$thisval = $match[1]; $thisval = $match[1];
if ( in_array(strtolower($attrname), $uris) ) if ( in_array(strtolower($attrname), $uris) )
@ -873,7 +873,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
} }
if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
# 'value' // 'value'
{ {
$thisval = $match[1]; $thisval = $match[1];
if ( in_array(strtolower($attrname), $uris) ) if ( in_array(strtolower($attrname), $uris) )
@ -889,7 +889,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
} }
if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
# value // value
{ {
$thisval = $match[1]; $thisval = $match[1];
if ( in_array(strtolower($attrname), $uris) ) if ( in_array(strtolower($attrname), $uris) )
@ -898,25 +898,25 @@ function wp_kses_hair($attr, $allowed_protocols) {
if(false === array_key_exists($attrname, $attrarr)) { if(false === array_key_exists($attrname, $attrarr)) {
$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
} }
# We add quotes to conform to W3C's HTML spec. // We add quotes to conform to W3C's HTML spec.
$working = 1; $working = 1;
$mode = 0; $mode = 0;
$attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr); $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
} }
break; break;
} # switch } // switch
if ($working == 0) # not well formed, remove and try again if ($working == 0) // not well formed, remove and try again
{ {
$attr = wp_kses_html_error($attr); $attr = wp_kses_html_error($attr);
$mode = 0; $mode = 0;
} }
} # while } // while
if ($mode == 1 && false === array_key_exists($attrname, $attrarr)) if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
# special case, for when the attribute list ends with a valueless // special case, for when the attribute list ends with a valueless
# attribute like "selected" // attribute like "selected"
$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
return $attrarr; return $attrarr;
@ -941,28 +941,28 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
switch (strtolower($checkname)) { switch (strtolower($checkname)) {
case 'maxlen' : case 'maxlen' :
# The maxlen check makes sure that the attribute value has a length not // The maxlen check makes sure that the attribute value has a length not
# greater than the given value. This can be used to avoid Buffer Overflows // greater than the given value. This can be used to avoid Buffer Overflows
# in WWW clients and various Internet servers. // in WWW clients and various Internet servers.
if (strlen($value) > $checkvalue) if (strlen($value) > $checkvalue)
$ok = false; $ok = false;
break; break;
case 'minlen' : case 'minlen' :
# The minlen check makes sure that the attribute value has a length not // The minlen check makes sure that the attribute value has a length not
# smaller than the given value. // smaller than the given value.
if (strlen($value) < $checkvalue) if (strlen($value) < $checkvalue)
$ok = false; $ok = false;
break; break;
case 'maxval' : case 'maxval' :
# The maxval check does two things: it checks that the attribute value is // The maxval check does two things: it checks that the attribute value is
# an integer from 0 and up, without an excessive amount of zeroes or // an integer from 0 and up, without an excessive amount of zeroes or
# whitespace (to avoid Buffer Overflows). It also checks that the attribute // whitespace (to avoid Buffer Overflows). It also checks that the attribute
# value is not greater than the given value. // value is not greater than the given value.
# This check can be used to avoid Denial of Service attacks. // This check can be used to avoid Denial of Service attacks.
if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
$ok = false; $ok = false;
@ -971,8 +971,8 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
break; break;
case 'minval' : case 'minval' :
# The minval check makes sure that the attribute value is a positive integer, // The minval check makes sure that the attribute value is a positive integer,
# and that it is not smaller than the given value. // and that it is not smaller than the given value.
if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
$ok = false; $ok = false;
@ -981,15 +981,15 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
break; break;
case 'valueless' : case 'valueless' :
# The valueless check makes sure if the attribute has a value // The valueless check makes sure if the attribute has a value
# (like <a href="blah">) or not (<option selected>). If the given value // (like <a href="blah">) or not (<option selected>). If the given value
# is a "y" or a "Y", the attribute must not have a value. // is a "y" or a "Y", the attribute must not have a value.
# If the given value is an "n" or an "N", the attribute must have one. // If the given value is an "n" or an "N", the attribute must have one.
if (strtolower($checkvalue) != $vless) if (strtolower($checkvalue) != $vless)
$ok = false; $ok = false;
break; break;
} # switch } // switch
return $ok; return $ok;
} }
@ -1074,8 +1074,8 @@ function wp_kses_array_lc($inarray) {
foreach ( (array) $inval as $inkey2 => $inval2) { foreach ( (array) $inval as $inkey2 => $inval2) {
$outkey2 = strtolower($inkey2); $outkey2 = strtolower($inkey2);
$outarray[$outkey][$outkey2] = $inval2; $outarray[$outkey][$outkey2] = $inval2;
} # foreach $inval } // foreach $inval
} # foreach $inarray } // foreach $inarray
return $outarray; return $outarray;
} }
@ -1181,11 +1181,11 @@ function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
* @return string Content with normalized entities * @return string Content with normalized entities
*/ */
function wp_kses_normalize_entities($string) { function wp_kses_normalize_entities($string) {
# Disarm all entities by converting & to &amp; // Disarm all entities by converting & to &amp;
$string = str_replace('&', '&amp;', $string); $string = str_replace('&', '&amp;', $string);
# Change back the allowed entities in our entity whitelist // Change back the allowed entities in our entity whitelist
$string = preg_replace_callback('/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string); $string = preg_replace_callback('/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string);
$string = preg_replace_callback('/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string); $string = preg_replace_callback('/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string);

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31078'; $wp_version = '4.2-alpha-31079';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.