Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.414
diff -u -p -r1.414 bootstrap.inc
--- includes/bootstrap.inc	26 Jul 2010 03:05:36 -0000	1.414
+++ includes/bootstrap.inc	13 Aug 2010 15:59:09 -0000
@@ -19,7 +19,7 @@ define('DRUPAL_CORE_COMPATIBILITY', '7.x
 /**
  * Minimum supported version of PHP.
  */
-define('DRUPAL_MINIMUM_PHP',    '5.2.0');
+define('DRUPAL_MINIMUM_PHP', '5.2.3');
 
 /**
  * Minimum recommended value of PHP memory_limit.
@@ -1495,11 +1495,10 @@ function check_plain($text) {
   // internally by PHP in htmlspecialchars().
   // See http://www.php.net/releases/5_2_5.php.
   // @todo remove this when support for either IE6 or PHP < 5.2.5 is dropped.
-
   if ($php525) {
-    return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
+    return htmlspecialchars($text, ENT_QUOTES, 'UTF-8', FALSE);
   }
-  return (preg_match('/^./us', $text) == 1) ? htmlspecialchars($text, ENT_QUOTES, 'UTF-8') : '';
+  return (preg_match('/^./us', $text) == 1) ? htmlspecialchars($text, ENT_QUOTES, 'UTF-8', FALSE) : '';
 }
 
 /**
Index: includes/xmlrpc.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/xmlrpc.inc,v
retrieving revision 1.68
diff -u -p -r1.68 xmlrpc.inc
--- includes/xmlrpc.inc	22 Jul 2010 16:20:15 -0000	1.68
+++ includes/xmlrpc.inc	13 Aug 2010 16:00:04 -0000
@@ -108,7 +108,7 @@ function xmlrpc_value_get_xml($xmlrpc_va
     case 'string':
       // Note: we don't escape apostrophes because of the many blogging clients
       // that don't support numerical entities (and XML in general) properly.
-      return '<string>' . htmlspecialchars($xmlrpc_value->data) . '</string>';
+      return '<string>' . htmlspecialchars($xmlrpc_value->data, ENT_COMPAT, 'UTF-8', FALSE) . '</string>';
 
     case 'array':
       $return = '<array><data>' . "\n";
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.44
diff -u -p -r1.44 aggregator.test
--- modules/aggregator/aggregator.test	5 Aug 2010 23:53:37 -0000	1.44
+++ modules/aggregator/aggregator.test	13 Aug 2010 16:01:02 -0000
@@ -188,11 +188,9 @@ class AggregatorTestCase extends DrupalW
   function getValidOpml($feeds) {
     // Properly escape URLs so that XML parsers don't choke on them.
     foreach ($feeds as &$feed) {
-      $feed['url'] = htmlspecialchars($feed['url']);
+      $feed['url'] = check_plain($feed['url']);
     }
-    /**
-     * Does not have an XML declaration, must pass the parser.
-     */
+    // Does not have an XML declaration, must pass the parser.
     $opml = <<<EOF
 <opml version="1.0">
   <head></head>