<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[23265] trunk: Tighten our braces.</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23265">23265</a></dd>

<dt>Author</dt> <dd>westi</dd>

<dt>Date</dt> <dd>2013-01-04 10:13:51 +0000 (Fri, 04 Jan 2013)</dd>

</dl>

<h3>Log Message</h3>

<pre>Tighten our braces. Fixes <a href="http://core.trac.wordpress.org/ticket/23118">#23118</a> props evansolomon.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>

<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>

<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>

<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>

<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>

<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>

<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>

<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>

<li><a href="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>

<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludesdashboardphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/dashboard.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-admin/includes/dashboard.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -232,7 +232,7 @@

</span><span class="cx"> 

</span><span class="cx">         $num_tags = wp_count_terms('post_tag');

</span><span class="cx"> 

</span><del>-        $num_comm = wp_count_comments( );

</del><ins>+        $num_comm = wp_count_comments();

</ins><span class="cx"> 

</span><span class="cx">         echo &quot;\n\t&quot;.'&lt;div class=&quot;table table_content&quot;&gt;';

</span><span class="cx">         echo &quot;\n\t&quot;.'&lt;p class=&quot;sub&quot;&gt;' . __('Content') . '&lt;/p&gt;'.&quot;\n\t&quot;.'&lt;table&gt;';

</span></span></pre></div>

<a id="trunkwpadminincludesthemeinstallphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/theme-install.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-admin/includes/theme-install.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -28,14 +28,14 @@

</span><span class="cx">  *

</span><span class="cx">  * @return array

</span><span class="cx">  */

</span><del>-function install_themes_feature_list( ) {

</del><ins>+function install_themes_feature_list() {

</ins><span class="cx">         if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )

</span><span class="cx">                 set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );

</span><span class="cx"> 

</span><span class="cx">         if ( $cache )

</span><span class="cx">                 return $cache;

</span><span class="cx"> 

</span><del>-        $feature_list = themes_api( 'feature_list', array( ) );

</del><ins>+        $feature_list = themes_api( 'feature_list', array() );

</ins><span class="cx">         if ( is_wp_error( $feature_list ) )

</span><span class="cx">                 return $features;

</span><span class="cx"> 

</span><span class="lines">@@ -100,7 +100,7 @@

</span><span class="cx"> &lt;form method=&quot;get&quot; action=&quot;&quot;&gt;

</span><span class="cx">         &lt;input type=&quot;hidden&quot; name=&quot;tab&quot; value=&quot;search&quot; /&gt;

</span><span class="cx">         &lt;?php

</span><del>-        $feature_list = get_theme_feature_list( );

</del><ins>+        $feature_list = get_theme_feature_list();

</ins><span class="cx">         echo '&lt;div class=&quot;feature-filter&quot;&gt;';

</span><span class="cx"> 

</span><span class="cx">         foreach ( (array) $feature_list as $feature_name =&gt; $features ) {

</span></span></pre></div>

<a id="trunkwpadminincludesthemephp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/theme.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-admin/includes/theme.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -216,10 +216,10 @@

</span><span class="cx">                 return $features;

</span><span class="cx"> 

</span><span class="cx">         if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )

</span><del>-                set_site_transient( 'wporg_theme_feature_list', array( ), 10800);

</del><ins>+                set_site_transient( 'wporg_theme_feature_list', array(), 10800);

</ins><span class="cx"> 

</span><span class="cx">         if ( !$feature_list ) {

</span><del>-                $feature_list = themes_api( 'feature_list', array( ) );

</del><ins>+                $feature_list = themes_api( 'feature_list', array() );

</ins><span class="cx">                 if ( is_wp_error( $feature_list ) )

</span><span class="cx">                         return $features;

</span><span class="cx">         }

</span></span></pre></div>

<a id="trunkwpadminincludesupgradephp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/upgrade.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-admin/includes/upgrade.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -218,7 +218,7 @@

</span><span class="cx">         update_option( 'widget_archives', array ( 2 =&gt; array ( 'title' =&gt; '', 'count' =&gt; 0, 'dropdown' =&gt; 0 ), '_multiwidget' =&gt; 1 ) );

</span><span class="cx">         update_option( 'widget_categories', array ( 2 =&gt; array ( 'title' =&gt; '', 'count' =&gt; 0, 'hierarchical' =&gt; 0, 'dropdown' =&gt; 0 ), '_multiwidget' =&gt; 1 ) );

</span><span class="cx">         update_option( 'widget_meta', array ( 2 =&gt; array ( 'title' =&gt; '' ), '_multiwidget' =&gt; 1 ) );

</span><del>-        update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' =&gt; array ( ), 'sidebar-1' =&gt; array ( 0 =&gt; 'search-2', 1 =&gt; 'recent-posts-2', 2 =&gt; 'recent-comments-2', 3 =&gt; 'archives-2', 4 =&gt; 'categories-2', 5 =&gt; 'meta-2', ), 'sidebar-2' =&gt; array ( ), 'sidebar-3' =&gt; array ( ), 'array_version' =&gt; 3 ) );

</del><ins>+        update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' =&gt; array (), 'sidebar-1' =&gt; array ( 0 =&gt; 'search-2', 1 =&gt; 'recent-posts-2', 2 =&gt; 'recent-comments-2', 3 =&gt; 'archives-2', 4 =&gt; 'categories-2', 5 =&gt; 'meta-2', ), 'sidebar-2' =&gt; array (), 'sidebar-3' =&gt; array (), 'array_version' =&gt; 3 ) );

</ins><span class="cx"> 

</span><span class="cx">         if ( ! is_multisite() )

</span><span class="cx">                 update_user_meta( $user_id, 'show_welcome_panel', 1 );

</span></span></pre></div>

<a id="trunkwpincludescommentphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/comment.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-includes/comment.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -415,7 +415,7 @@

</span><span class="cx">  *

<span class="cx">  * @return array List of comment statuses.

</span><span class="cx">  */

</span><del>-function get_comment_statuses( ) {

</del><ins>+function get_comment_statuses() {

</ins><span class="cx">         $status = array(

</span><span class="cx">                 'hold'                =&gt; __('Unapproved'),

</span><span class="cx">                 /* translators: comment status  */

</span></span></pre></div>

<a id="trunkwpincludesdefaultconstantsphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/default-constants.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-includes/default-constants.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -12,7 +12,7 @@

</span><span class="cx">  *

</span><span class="cx">  * @since 3.0.0

</span><span class="cx">  */

</span><del>-function wp_initial_constants( ) {

</del><ins>+function wp_initial_constants() {

</ins><span class="cx">         global $blog_id;

</span><span class="cx"> 

</span><span class="cx">         // set memory limits

</span><span class="lines">@@ -89,7 +89,7 @@

</span><span class="cx">  *

</span><span class="cx">  * @since 3.0.0

</span><span class="cx">  */

</span><del>-function wp_plugin_directory_constants( ) {

</del><ins>+function wp_plugin_directory_constants() {

</ins><span class="cx">         if ( !defined('WP_CONTENT_URL') )

</span><span class="cx">                 define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up

</span><span class="cx"> 

</span><span class="lines">@@ -150,7 +150,7 @@

<span class="cx">  * Defines constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().

</span><span class="cx">  * @since 3.0.0

</span><span class="cx">  */

</span><del>-function wp_cookie_constants( ) {

</del><ins>+function wp_cookie_constants() {

</ins><span class="cx">         /**

</span><span class="cx">          * Used to guarantee unique hash cookies

</span><span class="cx">          * @since 1.5

</span><span class="lines">@@ -235,7 +235,7 @@

</span><span class="cx">  *

</span><span class="cx">  * @since 3.0.0

</span><span class="cx">  */

</span><del>-function wp_ssl_constants( ) {

</del><ins>+function wp_ssl_constants() {

</ins><span class="cx">         /**

</span><span class="cx">          * @since 2.6.0

</span><span class="cx">          */

</span><span class="lines">@@ -256,7 +256,7 @@

</span><span class="cx">  *

</span><span class="cx">  * @since 3.0.0

</span><span class="cx">  */

</span><del>-function wp_functionality_constants( ) {

</del><ins>+function wp_functionality_constants() {

</ins><span class="cx">         /**

</span><span class="cx">          * @since 2.5.0

</span><span class="cx">          */

</span><span class="lines">@@ -284,7 +284,7 @@

</span><span class="cx">  *

</span><span class="cx">  * @since 3.0.0

</span><span class="cx">  */

</span><del>-function wp_templating_constants( ) {

</del><ins>+function wp_templating_constants() {

</ins><span class="cx">         /**

</span><span class="cx">          * Filesystem path to the current active template directory

</span><span class="cx">          * @since 1.5.0

</span></span></pre></div>

<a id="trunkwpincludesformattingphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/formatting.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-includes/formatting.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -2977,7 +2977,7 @@

<span class="cx">  * @return string The formatted string.

</span><span class="cx">  */

</span><span class="cx"> function wp_sprintf( $pattern ) {

</span><del>-        $args = func_get_args( );

</del><ins>+        $args = func_get_args();

</ins><span class="cx">         $len = strlen($pattern);

</span><span class="cx">         $start = 0;

</span><span class="cx">         $result = '';

</span></span></pre></div>

<a id="trunkwpincludespostphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/post.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-includes/post.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -861,7 +861,7 @@

</span><span class="cx">  *

<span class="cx">  * @return array List of post statuses.

</span><span class="cx">  */

</span><del>-function get_post_statuses( ) {

</del><ins>+function get_post_statuses() {

</ins><span class="cx">         $status = array(

</span><span class="cx">                 'draft'                        =&gt; __('Draft'),

</span><span class="cx">                 'pending'                =&gt; __('Pending Review'),

</span><span class="lines">@@ -882,7 +882,7 @@

</span><span class="cx">  *

<span class="cx">  * @return array List of page statuses.

</span><span class="cx">  */

</span><del>-function get_page_statuses( ) {

</del><ins>+function get_page_statuses() {

</ins><span class="cx">         $status = array(

</span><span class="cx">                 'draft'                        =&gt; __('Draft'),

</span><span class="cx">                 'private'                =&gt; __('Private'),

</span><span class="lines">@@ -2173,7 +2173,7 @@

</span><span class="cx">         $and = wp_post_mime_type_where( $mime_type );

</span><span class="cx">         $count = $wpdb-&gt;get_results( &quot;SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb-&gt;posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type&quot;, ARRAY_A );

</span><span class="cx"> 

</span><del>-        $stats = array( );

</del><ins>+        $stats = array();

</ins><span class="cx">         foreach( (array) $count as $row ) {

</span><span class="cx">                 $stats[$row['post_mime_type']] = $row['num_posts'];

</span><span class="cx">         }

</span></span></pre></div>

<a id="trunkwpincludesupdatephp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/update.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-includes/update.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -51,13 +51,13 @@

</span><span class="cx">         else

</span><span class="cx">                 $mysql_version = 'N/A';

</span><span class="cx"> 

</span><del>-        if ( is_multisite( ) ) {

-                $user_count = get_user_count( );

-                $num_blogs = get_blog_count( );

-                $wp_install = network_site_url( );

</del><ins>+        if ( is_multisite() ) {

+                $user_count = get_user_count();

+                $num_blogs = get_blog_count();

+                $wp_install = network_site_url();

</ins><span class="cx">                 $multisite_enabled = 1;

</span><span class="cx">         } else {

</span><del>-                $user_count = count_users( );

</del><ins>+                $user_count = count_users();

</ins><span class="cx">                 $user_count = $user_count['total_users'];

</span><span class="cx">                 $multisite_enabled = 0;

</span><span class="cx">                 $num_blogs = 1;

</span><span class="lines">@@ -274,7 +274,7 @@

</span><span class="cx">                         $timeout = 12 * HOUR_IN_SECONDS;

</span><span class="cx">         }

</span><span class="cx"> 

</span><del>-        $time_not_changed = isset( $last_update-&gt;last_checked ) &amp;&amp; $timeout &gt; ( time( ) - $last_update-&gt;last_checked );

</del><ins>+        $time_not_changed = isset( $last_update-&gt;last_checked ) &amp;&amp; $timeout &gt; ( time() - $last_update-&gt;last_checked );

</ins><span class="cx"> 

</span><span class="cx">         if ( $time_not_changed ) {

</span><span class="cx">                 $theme_changed = false;

</span><span class="lines">@@ -313,7 +313,7 @@

</span><span class="cx">                 return false;

</span><span class="cx"> 

</span><span class="cx">         $new_update = new stdClass;

</span><del>-        $new_update-&gt;last_checked = time( );

</del><ins>+        $new_update-&gt;last_checked = time();

</ins><span class="cx">         $new_update-&gt;checked = $checked;

</span><span class="cx"> 

</span><span class="cx">         $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );

</span><span class="lines">@@ -404,9 +404,9 @@

</span><span class="cx">  * @since 2.7.0

</span><span class="cx">  * @access private

</span><span class="cx">  */

</span><del>-function _maybe_update_themes( ) {

</del><ins>+function _maybe_update_themes() {

</ins><span class="cx">         $current = get_site_transient( 'update_themes' );

</span><del>-        if ( isset( $current-&gt;last_checked ) &amp;&amp; 12 * HOUR_IN_SECONDS &gt; ( time( ) - $current-&gt;last_checked ) )

</del><ins>+        if ( isset( $current-&gt;last_checked ) &amp;&amp; 12 * HOUR_IN_SECONDS &gt; ( time() - $current-&gt;last_checked ) )

</ins><span class="cx">                 return;

</span><span class="cx"> 

</span><span class="cx">         wp_update_themes();

</span></span></pre></div>

<a id="trunkwpsettingsphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-settings.php (23264 => 23265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-settings.php        2013-01-04 08:52:18 UTC (rev 23264)

+++ trunk/wp-settings.php        2013-01-04 10:13:51 UTC (rev 23265)

</span><span class="lines">@@ -23,7 +23,7 @@

</span><span class="cx"> require( ABSPATH . WPINC . '/version.php' );

</span><span class="cx"> 

<span class="cx"> // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.

</span><del>-wp_initial_constants( );

</del><ins>+wp_initial_constants();

</ins><span class="cx"> 

<span class="cx"> // Check for the required PHP version and for the MySQL extension or a database drop-in.

</span><span class="cx"> wp_check_php_mysql_versions();

</span><span class="lines">@@ -152,7 +152,7 @@

</span><span class="cx"> 

<span class="cx"> // Define constants that rely on the API to obtain the default value.

<span class="cx"> // Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in.

</span><del>-wp_plugin_directory_constants( );

</del><ins>+wp_plugin_directory_constants();

</ins><span class="cx"> 

<span class="cx"> // Load must-use plugins.

</span><span class="cx"> foreach ( wp_get_mu_plugins() as $mu_plugin ) {

</span><span class="lines">@@ -174,10 +174,10 @@

</span><span class="cx">         ms_cookie_constants(  );

</span><span class="cx"> 

<span class="cx"> // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().

</span><del>-wp_cookie_constants( );

</del><ins>+wp_cookie_constants();

</ins><span class="cx"> 

</span><span class="cx"> // Define and enforce our SSL constants

</span><del>-wp_ssl_constants( );

</del><ins>+wp_ssl_constants();

</ins><span class="cx"> 

<span class="cx"> // Create common globals.

</span><span class="cx"> require( ABSPATH . WPINC . '/vars.php' );

</span><span class="lines">@@ -209,7 +209,7 @@

</span><span class="cx"> do_action( 'plugins_loaded' );

</span><span class="cx"> 

<span class="cx"> // Define constants which affect functionality if not already defined.

</span><del>-wp_functionality_constants( );

</del><ins>+wp_functionality_constants();

</ins><span class="cx"> 

</span><span class="cx"> // Add magic quotes and set up $_REQUEST ( $_GET + $_POST )

</span><span class="cx"> wp_magic_quotes();

</span></span></pre>

</div>

</div>

</body>

</html>