<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12752] trunk: Coding standards, space after if</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12752">12752</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-18 20:34:48 +0000 (Mon, 18 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Coding standards, space after if</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminimportbloggerphp">trunk/wp-admin/import/blogger.php</a></li>
<li><a href="#trunkwpadminimportblogwarephp">trunk/wp-admin/import/blogware.php</a></li>
<li><a href="#trunkwpadminimportdotclearphp">trunk/wp-admin/import/dotclear.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystembasephp">trunk/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemssh2php">trunk/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsupgradesitephp">trunk/wp-admin/ms-upgrade-site.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/custom-header.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function toggle_text(force) {
</span><del>- if(jQuery('#textcolor').val() == 'blank') {
</del><ins>+ if (jQuery('#textcolor').val() == 'blank') {
</ins><span class="cx"> //Show text
</span><span class="cx"> jQuery( buttons.toString() ).show();
</span><span class="cx"> jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>');
</span></span></pre></div>
<a id="trunkwpadminimportbloggerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/blogger.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/blogger.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/import/blogger.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx">
</span><span class="cx"> // First line of headers is the HTTP response code
</span><span class="cx"> $http_response_line = array_shift($response_header_lines);
</span><del>- if(preg_match('@^HTTP/[0-9]\.[0-9] ([0-9]{3})@',$http_response_line, $matches)) { $response_code = $matches[1]; }
</del><ins>+ if (preg_match('@^HTTP/[0-9]\.[0-9] ([0-9]{3})@',$http_response_line, $matches)) { $response_code = $matches[1]; }
</ins><span class="cx">
</span><span class="cx"> // put the rest of the headers in an array
</span><span class="cx"> $response_header_array = array();
</span><span class="lines">@@ -958,7 +958,7 @@
</span><span class="cx">
</span><span class="cx"> $this->depth++;
</span><span class="cx">
</span><del>- if(!empty($this->in_content)) {
</del><ins>+ if (!empty($this->in_content)) {
</ins><span class="cx"> $attrs_prefix = array();
</span><span class="cx">
</span><span class="cx"> // resolve prefixes for attributes
</span><span class="lines">@@ -966,28 +966,28 @@
</span><span class="cx"> $attrs_prefix[$this->ns_to_prefix($key)] = $this->xml_escape($value);
</span><span class="cx"> }
</span><span class="cx"> $attrs_str = join(' ', array_map( array( &$this, '_map_attrs_func' ), array_keys($attrs_prefix), array_values($attrs_prefix)));
</span><del>- if(strlen($attrs_str) > 0) {
</del><ins>+ if (strlen($attrs_str) > 0) {
</ins><span class="cx"> $attrs_str = " " . $attrs_str;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $xmlns_str = join(' ', array_map( array( &$this, '_map_xmlns_func' ), array_keys($this->ns_contexts[0]), array_values($this->ns_contexts[0])));
</span><del>- if(strlen($xmlns_str) > 0) {
</del><ins>+ if (strlen($xmlns_str) > 0) {
</ins><span class="cx"> $xmlns_str = " " . $xmlns_str;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // handle self-closing tags (case: a new child found right-away, no text node)
</span><del>- if(count($this->in_content) == 2) {
</del><ins>+ if (count($this->in_content) == 2) {
</ins><span class="cx"> array_push($this->in_content, ">");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}");
</span><del>- } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
</del><ins>+ } else if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
</ins><span class="cx"> $this->in_content = array();
</span><span class="cx"> $this->is_xhtml = $attrs['type'] == 'xhtml';
</span><span class="cx"> array_push($this->in_content, array($tag,$this->depth));
</span><del>- } else if($tag == 'link') {
</del><ins>+ } else if ($tag == 'link') {
</ins><span class="cx"> array_push($this->entry->links, $attrs);
</span><del>- } else if($tag == 'category') {
</del><ins>+ } else if ($tag == 'category') {
</ins><span class="cx"> array_push($this->entry->categories, $attrs['term']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -998,11 +998,11 @@
</span><span class="cx">
</span><span class="cx"> $tag = array_pop(split(":", $name));
</span><span class="cx">
</span><del>- if(!empty($this->in_content)) {
- if($this->in_content[0][0] == $tag &&
</del><ins>+ if (!empty($this->in_content)) {
+ if ($this->in_content[0][0] == $tag &&
</ins><span class="cx"> $this->in_content[0][1] == $this->depth) {
</span><span class="cx"> array_shift($this->in_content);
</span><del>- if($this->is_xhtml) {
</del><ins>+ if ($this->is_xhtml) {
</ins><span class="cx"> $this->in_content = array_slice($this->in_content, 2, count($this->in_content)-3);
</span><span class="cx"> }
</span><span class="cx"> $this->entry->$tag = join('',$this->in_content);
</span><span class="lines">@@ -1035,7 +1035,7 @@
</span><span class="cx">
</span><span class="cx"> function cdata($parser, $data) {
</span><span class="cx"> #print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n";
</span><del>- if(!empty($this->in_content)) {
</del><ins>+ if (!empty($this->in_content)) {
</ins><span class="cx"> // handle self-closing tags (case: text node found, need to close element started)
</span><span class="cx"> if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
</span><span class="cx"> array_push($this->in_content, ">");
</span><span class="lines">@@ -1053,11 +1053,11 @@
</span><span class="cx"> $components = split(":", $qname);
</span><span class="cx"> $name = array_pop($components);
</span><span class="cx">
</span><del>- if(!empty($components)) {
</del><ins>+ if (!empty($components)) {
</ins><span class="cx"> $ns = join(":",$components);
</span><del>- foreach($this->ns_contexts as $context) {
- foreach($context as $mapping) {
- if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
</del><ins>+ foreach ($this->ns_contexts as $context) {
+ foreach ($context as $mapping) {
+ if ($mapping[1] == $ns && strlen($mapping[0]) > 0) {
</ins><span class="cx"> return "$mapping[0]:$name";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimportblogwarephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/blogware.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/blogware.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/import/blogware.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> flush();
</span><span class="cx"> preg_match('|<item type=\"(.*?)\">|is', $post, $post_type);
</span><span class="cx"> $post_type = $post_type[1];
</span><del>- if($post_type == "photo") {
</del><ins>+ if ($post_type == "photo") {
</ins><span class="cx"> preg_match('|<photoFilename>(.*?)</photoFilename>|is', $post, $post_title);
</span><span class="cx"> } else {
</span><span class="cx"> preg_match('|<title>(.*?)</title>|is', $post, $post_title);
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> $cat_index++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(strcasecmp($post_type, "photo") === 0) {
</del><ins>+ if (strcasecmp($post_type, "photo") === 0) {
</ins><span class="cx"> preg_match('|<sizedPhotoUrl>(.*?)</sizedPhotoUrl>|is', $post, $post_content);
</span><span class="cx"> $post_content = '<img src="'.trim($post_content[1]).'" />';
</span><span class="cx"> $post_content = $this->unhtmlentities($post_content);
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> echo '</li>';
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if(0 != count($categories))
</del><ins>+ if (0 != count($categories))
</ins><span class="cx"> wp_create_categories($categories, $post_id);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminimportdotclearphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/dotclear.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/dotclear.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/import/dotclear.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -12,8 +12,7 @@
</span><span class="cx"> Add These Functions to make our lives easier
</span><span class="cx"> **/
</span><span class="cx">
</span><del>-if(!function_exists('get_comment_count'))
-{
</del><ins>+if (!function_exists('get_comment_count')) {
</ins><span class="cx"> /**
</span><span class="cx"> * Get the comment count for posts.
</span><span class="cx"> *
</span><span class="lines">@@ -30,8 +29,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if(!function_exists('link_exists'))
-{
</del><ins>+if (!function_exists('link_exists')) {
</ins><span class="cx"> /**
</span><span class="cx"> * Check whether link already exists.
</span><span class="cx"> *
</span><span class="lines">@@ -180,11 +178,9 @@
</span><span class="cx"> $count = 0;
</span><span class="cx"> $dccat2wpcat = array();
</span><span class="cx"> // Do the Magic
</span><del>- if(is_array($categories))
- {
</del><ins>+ if (is_array($categories)) {
</ins><span class="cx"> echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
</span><del>- foreach ($categories as $category)
- {
</del><ins>+ foreach ($categories as $category) {
</ins><span class="cx"> $count++;
</span><span class="cx"> extract($category);
</span><span class="cx">
</span><span class="lines">@@ -193,12 +189,9 @@
</span><span class="cx"> $title = $wpdb->escape(csc ($cat_libelle));
</span><span class="cx"> $desc = $wpdb->escape(csc ($cat_desc));
</span><span class="cx">
</span><del>- if($cinfo = category_exists($name))
- {
</del><ins>+ if ($cinfo = category_exists($name)) {
</ins><span class="cx"> $ret_id = wp_insert_category(array('cat_ID' => $cinfo, 'category_nicename' => $name, 'cat_name' => $title, 'category_description' => $desc));
</span><del>- }
- else
- {
</del><ins>+ } else {
</ins><span class="cx"> $ret_id = wp_insert_category(array('category_nicename' => $name, 'cat_name' => $title, 'category_description' => $desc));
</span><span class="cx"> }
</span><span class="cx"> $dccat2wpcat[$id] = $ret_id;
</span><span class="lines">@@ -213,19 +206,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function users2wp($users='')
- {
</del><ins>+ function users2wp($users='') {
</ins><span class="cx"> // General Housekeeping
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $count = 0;
</span><span class="cx"> $dcid2wpid = array();
</span><span class="cx">
</span><span class="cx"> // Midnight Mojo
</span><del>- if(is_array($users))
- {
</del><ins>+ if (is_array($users)) {
</ins><span class="cx"> echo '<p>'.__('Importing Users...').'<br /><br /></p>';
</span><del>- foreach($users as $user)
- {
</del><ins>+ foreach ($users as $user) {
</ins><span class="cx"> $count++;
</span><span class="cx"> extract($user);
</span><span class="cx">
</span><span class="lines">@@ -233,8 +223,7 @@
</span><span class="cx"> $name = $wpdb->escape(csc ($name));
</span><span class="cx"> $RealName = $wpdb->escape(csc ($user_pseudo));
</span><span class="cx">
</span><del>- if($uinfo = get_userdatabylogin($name))
- {
</del><ins>+ if ($uinfo = get_userdatabylogin($name)) {
</ins><span class="cx">
</span><span class="cx"> $ret_id = wp_insert_user(array(
</span><span class="cx"> 'ID' => $uinfo->ID,
</span><span class="lines">@@ -244,9 +233,7 @@
</span><span class="cx"> 'user_url' => 'http://',
</span><span class="cx"> 'display_name' => $Realname)
</span><span class="cx"> );
</span><del>- }
- else
- {
</del><ins>+ } else {
</ins><span class="cx"> $ret_id = wp_insert_user(array(
</span><span class="cx"> 'user_login' => $user_id,
</span><span class="cx"> 'user_nicename' => csc ($user_pseudo),
</span><span class="lines">@@ -262,12 +249,12 @@
</span><span class="cx"> // Update Usermeta Data
</span><span class="cx"> $user = new WP_User($ret_id);
</span><span class="cx"> $wp_perms = $user_level + 1;
</span><del>- if(10 == $wp_perms) { $user->set_role('administrator'); }
- else if(9 == $wp_perms) { $user->set_role('editor'); }
- else if(5 <= $wp_perms) { $user->set_role('editor'); }
- else if(4 <= $wp_perms) { $user->set_role('author'); }
- else if(3 <= $wp_perms) { $user->set_role('contributor'); }
- else if(2 <= $wp_perms) { $user->set_role('contributor'); }
</del><ins>+ if (10 == $wp_perms) { $user->set_role('administrator'); }
+ else if (9 == $wp_perms) { $user->set_role('editor'); }
+ else if (5 <= $wp_perms) { $user->set_role('editor'); }
+ else if (4 <= $wp_perms) { $user->set_role('author'); }
+ else if (3 <= $wp_perms) { $user->set_role('contributor'); }
+ else if (2 <= $wp_perms) { $user->set_role('contributor'); }
</ins><span class="cx"> else { $user->set_role('subscriber'); }
</span><span class="cx">
</span><span class="cx"> update_usermeta( $ret_id, 'wp_user_level', $wp_perms);
</span><span class="lines">@@ -289,8 +276,7 @@
</span><span class="cx">
</span><span class="cx"> }// End function user2wp()
</span><span class="cx">
</span><del>- function posts2wp($posts='')
- {
</del><ins>+ function posts2wp($posts='') {
</ins><span class="cx"> // General Housekeeping
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $count = 0;
</span><span class="lines">@@ -298,8 +284,7 @@
</span><span class="cx"> $cats = array();
</span><span class="cx">
</span><span class="cx"> // Do the Magic
</span><del>- if(is_array($posts))
- {
</del><ins>+ if (is_array($posts)) {
</ins><span class="cx"> echo '<p>'.__('Importing Posts...').'<br /><br /></p>';
</span><span class="cx"> foreach($posts as $post)
</span><span class="cx"> {
</span><span class="lines">@@ -327,8 +312,7 @@
</span><span class="cx">
</span><span class="cx"> // Import Post data into WordPress
</span><span class="cx">
</span><del>- if($pinfo = post_exists($Title,$post_content))
- {
</del><ins>+ if ($pinfo = post_exists($Title,$post_content)) {
</ins><span class="cx"> $ret_id = wp_insert_post(array(
</span><span class="cx"> 'ID' => $pinfo,
</span><span class="cx"> 'post_author' => $authorid,
</span><span class="lines">@@ -347,9 +331,7 @@
</span><span class="cx"> );
</span><span class="cx"> if ( is_wp_error( $ret_id ) )
</span><span class="cx"> return $ret_id;
</span><del>- }
- else
- {
</del><ins>+ } else {
</ins><span class="cx"> $ret_id = wp_insert_post(array(
</span><span class="cx"> 'post_author' => $authorid,
</span><span class="cx"> 'post_date' => $post_dt,
</span><span class="lines">@@ -375,9 +357,9 @@
</span><span class="cx"> $category1 = get_category_by_slug($post_cat_name);
</span><span class="cx"> $category1 = $category1->term_id;
</span><span class="cx">
</span><del>- if($cat1 = $category1) { $cats[1] = $cat1; }
</del><ins>+ if ($cat1 = $category1) { $cats[1] = $cat1; }
</ins><span class="cx">
</span><del>- if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
</del><ins>+ if (!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> // Store ID translation for later use
</span><span class="lines">@@ -387,8 +369,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function comments2wp($comments='')
- {
</del><ins>+ function comments2wp($comments='') {
</ins><span class="cx"> // General Housekeeping
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $count = 0;
</span><span class="lines">@@ -396,11 +377,9 @@
</span><span class="cx"> $postarr = get_option('dcposts2wpposts');
</span><span class="cx">
</span><span class="cx"> // Magic Mojo
</span><del>- if(is_array($comments))
- {
</del><ins>+ if (is_array($comments)) {
</ins><span class="cx"> echo '<p>'.__('Importing Comments...').'<br /><br /></p>';
</span><del>- foreach($comments as $comment)
- {
</del><ins>+ foreach ($comments as $comment) {
</ins><span class="cx"> $count++;
</span><span class="cx"> extract($comment);
</span><span class="cx">
</span><span class="lines">@@ -449,18 +428,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function links2wp($links='')
- {
</del><ins>+ function links2wp($links='') {
</ins><span class="cx"> // General Housekeeping
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $count = 0;
</span><span class="cx">
</span><span class="cx"> // Deal with the links
</span><del>- if(is_array($links))
- {
</del><ins>+ if (is_array($links)) {
</ins><span class="cx"> echo '<p>'.__('Importing Links...').'<br /><br /></p>';
</span><del>- foreach($links as $link)
- {
</del><ins>+ foreach ($links as $link) {
</ins><span class="cx"> $count++;
</span><span class="cx"> extract($link);
</span><span class="cx">
</span><span class="lines">@@ -475,7 +451,7 @@
</span><span class="cx"> $linkname = $wpdb->escape(csc ($label));
</span><span class="cx"> $description = $wpdb->escape(csc ($title));
</span><span class="cx">
</span><del>- if($linfo = link_exists($linkname)) {
</del><ins>+ if ($linfo = link_exists($linkname)) {
</ins><span class="cx"> $ret_id = wp_insert_link(array(
</span><span class="cx"> 'link_id' => $linfo,
</span><span class="cx"> 'link_url' => $href,
</span><span class="lines">@@ -504,8 +480,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function import_categories()
- {
</del><ins>+ function import_categories() {
</ins><span class="cx"> // Category Import
</span><span class="cx"> $cats = $this->get_dc_cats();
</span><span class="cx"> $this->cat2wp($cats);
</span><span class="lines">@@ -520,8 +495,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function import_users()
- {
</del><ins>+ function import_users() {
</ins><span class="cx"> // User Import
</span><span class="cx"> $users = $this->get_dc_users();
</span><span class="cx"> $this->users2wp($users);
</span><span class="lines">@@ -532,8 +506,7 @@
</span><span class="cx"> echo '</form>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function import_posts()
- {
</del><ins>+ function import_posts() {
</ins><span class="cx"> // Post Import
</span><span class="cx"> $posts = $this->get_dc_posts();
</span><span class="cx"> $result = $this->posts2wp($posts);
</span><span class="lines">@@ -546,8 +519,7 @@
</span><span class="cx"> echo '</form>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function import_comments()
- {
</del><ins>+ function import_comments() {
</ins><span class="cx"> // Comment Import
</span><span class="cx"> $comments = $this->get_dc_comments();
</span><span class="cx"> $this->comments2wp($comments);
</span><span class="lines">@@ -571,8 +543,7 @@
</span><span class="cx"> echo '</form>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function cleanup_dcimport()
- {
</del><ins>+ function cleanup_dcimport() {
</ins><span class="cx"> delete_option('dcdbprefix');
</span><span class="cx"> delete_option('dc_cats');
</span><span class="cx"> delete_option('dcid2wpid');
</span><span class="lines">@@ -589,8 +560,7 @@
</span><span class="cx"> $this->tips();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function tips()
- {
</del><ins>+ function tips() {
</ins><span class="cx"> echo '<p>'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from DotClear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'</p>';
</span><span class="cx"> echo '<h3>'.__('Users').'</h3>';
</span><span class="cx"> echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn&#8217;t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="%1$s">Log in</a> and change it.'), '/wp-login.php').'</p>';
</span><span class="lines">@@ -608,8 +578,7 @@
</span><span class="cx"> echo '<p>'.sprintf(__('That&#8217;s it! What are you waiting for? Go <a href="%1$s">log in</a>!'), '../wp-login.php').'</p>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function db_form()
- {
</del><ins>+ function db_form() {
</ins><span class="cx"> echo '<table class="form-table">';
</span><span class="cx"> printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('DotClear Database User:'));
</span><span class="cx"> printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:'));
</span><span class="lines">@@ -620,8 +589,7 @@
</span><span class="cx"> echo '</table>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function dispatch()
- {
</del><ins>+ function dispatch() {
</ins><span class="cx">
</span><span class="cx"> if (empty ($_GET['step']))
</span><span class="cx"> $step = 0;
</span><span class="lines">@@ -629,44 +597,37 @@
</span><span class="cx"> $step = (int) $_GET['step'];
</span><span class="cx"> $this->header();
</span><span class="cx">
</span><del>- if ( $step > 0 )
- {
</del><ins>+ if ( $step > 0 ) {
</ins><span class="cx"> check_admin_referer('import-dotclear');
</span><span class="cx">
</span><del>- if($_POST['dbuser'])
- {
</del><ins>+ if ($_POST['dbuser']) {
</ins><span class="cx"> if(get_option('dcuser'))
</span><span class="cx"> delete_option('dcuser');
</span><span class="cx"> add_option('dcuser', sanitize_user($_POST['dbuser'], true));
</span><span class="cx"> }
</span><del>- if($_POST['dbpass'])
- {
</del><ins>+ if ($_POST['dbpass']) {
</ins><span class="cx"> if(get_option('dcpass'))
</span><span class="cx"> delete_option('dcpass');
</span><span class="cx"> add_option('dcpass', sanitize_user($_POST['dbpass'], true));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if($_POST['dbname'])
- {
- if(get_option('dcname'))
</del><ins>+ if ($_POST['dbname']) {
+ if (get_option('dcname'))
</ins><span class="cx"> delete_option('dcname');
</span><span class="cx"> add_option('dcname', sanitize_user($_POST['dbname'], true));
</span><span class="cx"> }
</span><del>- if($_POST['dbhost'])
- {
</del><ins>+ if ($_POST['dbhost']) {
</ins><span class="cx"> if(get_option('dchost'))
</span><span class="cx"> delete_option('dchost');
</span><span class="cx"> add_option('dchost', sanitize_user($_POST['dbhost'], true));
</span><span class="cx"> }
</span><del>- if($_POST['dccharset'])
- {
- if(get_option('dccharset'))
</del><ins>+ if ($_POST['dccharset']) {
+ if (get_option('dccharset'))
</ins><span class="cx"> delete_option('dccharset');
</span><span class="cx"> add_option('dccharset', sanitize_user($_POST['dccharset'], true));
</span><span class="cx"> }
</span><del>- if($_POST['dbprefix'])
- {
- if(get_option('dcdbprefix'))
</del><ins>+ if ($_POST['dbprefix']) {
+ if (get_option('dcdbprefix'))
</ins><span class="cx"> delete_option('dcdbprefix');
</span><span class="cx"> add_option('dcdbprefix', sanitize_user($_POST['dbprefix'], true));
</span><span class="cx"> }
</span><span class="lines">@@ -674,8 +635,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch ($step)
- {
</del><ins>+ switch ($step) {
</ins><span class="cx"> default:
</span><span class="cx"> case 0 :
</span><span class="cx"> $this->greet();
</span><span class="lines">@@ -705,8 +665,7 @@
</span><span class="cx"> $this->footer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function Dotclear_Import()
- {
</del><ins>+ function Dotclear_Import() {
</ins><span class="cx"> // Nothing.
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-base.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-base.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/class-wp-filesystem-base.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> $this->cache[ $folder ] = $folder;
</span><span class="cx"> return $folder;
</span><span class="cx"> }
</span><del>- if( $return = $this->search_for_folder($folder) )
</del><ins>+ if ( $return = $this->search_for_folder($folder) )
</ins><span class="cx"> $this->cache[ $folder ] = $return;
</span><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="lines">@@ -288,8 +288,8 @@
</span><span class="cx"> $legal = array('', 'w', 'r', 'x', '-');
</span><span class="cx"> $attarray = preg_split('//', $mode);
</span><span class="cx">
</span><del>- for($i=0; $i < count($attarray); $i++)
- if($key = array_search($attarray[$i], $legal))
</del><ins>+ for ($i=0; $i < count($attarray); $i++)
+ if ($key = array_search($attarray[$i], $legal))
</ins><span class="cx"> $realmode .= $legal[$key];
</span><span class="cx">
</span><span class="cx"> $mode = str_pad($realmode, 9, '-');
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ssh2.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> function cwd() {
</span><span class="cx"> $cwd = $this->run_command('pwd');
</span><del>- if( $cwd )
</del><ins>+ if ( $cwd )
</ins><span class="cx"> $cwd = trailingslashit($cwd);
</span><span class="cx"> return $cwd;
</span><span class="cx"> }
</span><span class="lines">@@ -239,10 +239,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function copy($source, $destination, $overwrite = false ) {
</span><del>- if( ! $overwrite && $this->exists($destination) )
</del><ins>+ if ( ! $overwrite && $this->exists($destination) )
</ins><span class="cx"> return false;
</span><span class="cx"> $content = $this->get_contents($source);
</span><del>- if( false === $content)
</del><ins>+ if ( false === $content)
</ins><span class="cx"> return false;
</span><span class="cx"> return $this->put_contents($destination, $content);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $this->plugin = $this->upgrader->plugin_info();
</span><del>- if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
</del><ins>+ if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
</ins><span class="cx"> show_message(__('Reactivating the plugin&#8230;'));
</span><span class="cx"> echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/file.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -109,10 +109,10 @@
</span><span class="cx"> * @return bool|array False on failure, Else array of files
</span><span class="cx"> */
</span><span class="cx"> function list_files( $folder = '', $levels = 100 ) {
</span><del>- if( empty($folder) )
</del><ins>+ if ( empty($folder) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if( ! $levels )
</del><ins>+ if ( ! $levels )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $files = array();
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> if ( is_dir( $folder . '/' . $file ) ) {
</span><span class="cx"> $files2 = list_files( $folder . '/' . $file, $levels - 1);
</span><del>- if( $files2 )
</del><ins>+ if ( $files2 )
</ins><span class="cx"> $files = array_merge($files, $files2 );
</span><span class="cx"> else
</span><span class="cx"> $files[] = $folder . '/' . $file . '/';
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! class_exists("WP_Filesystem_$method") ) {
</span><span class="cx"> $abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method);
</span><del>- if( ! file_exists($abstraction_file) )
</del><ins>+ if ( ! file_exists($abstraction_file) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> require_once($abstraction_file);
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx"> function get_filesystem_method($args = array(), $context = false) {
</span><span class="cx"> $method = defined('FS_METHOD') ? FS_METHOD : false; //Please ensure that this is either 'direct', 'ssh', 'ftpext' or 'ftpsockets'
</span><span class="cx">
</span><del>- if( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){
</del><ins>+ if ( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){
</ins><span class="cx"> if ( !$context )
</span><span class="cx"> $context = WP_CONTENT_DIR;
</span><span class="cx"> $context = trailingslashit($context);
</span><span class="lines">@@ -807,12 +807,12 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
</span><del>-<td><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
</del><ins>+<td><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php if ( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="username"><?php _e('Username') ?></label></th>
</span><del>-<td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
</del><ins>+<td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php if ( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -827,7 +827,7 @@
</span><span class="cx"> <label for="public_key"><?php _e('Public Key:') ?></label ><br />
</span><span class="cx"> <label for="private_key"><?php _e('Private Key:') ?></label>
</span><span class="cx"> </div></th>
</span><del>-<td><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php if( defined('FTP_PUBKEY') ) echo ' disabled="disabled"' ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php if( defined('FTP_PRIKEY') ) echo ' disabled="disabled"' ?> size="40" />
</del><ins>+<td><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php if ( defined('FTP_PUBKEY') ) echo ' disabled="disabled"' ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php if ( defined('FTP_PRIKEY') ) echo ' disabled="disabled"' ?> size="40" />
</ins><span class="cx"> <div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/misc.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -266,8 +266,8 @@
</span><span class="cx"> * @param unknown_type $message
</span><span class="cx"> */
</span><span class="cx"> function show_message($message) {
</span><del>- if( is_wp_error($message) ){
- if( $message->get_error_data() )
</del><ins>+ if ( is_wp_error($message) ){
+ if ( $message->get_error_data() )
</ins><span class="cx"> $message = $message->get_error_message() . ': ' . $message->get_error_data();
</span><span class="cx"> else
</span><span class="cx"> $message = $message->get_error_message();
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/ms.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> if ( get_site_option( 'upload_space_check_disabled' ) ) {
</span><span class="cx"> return $file;
</span><span class="cx"> }
</span><del>- if( $file['error'] != '0' ) // there's already an error
</del><ins>+ if ( $file['error'] != '0' ) // there's already an error
</ins><span class="cx"> return $file;
</span><span class="cx">
</span><span class="cx"> if ( defined( 'WP_IMPORTING' ) )
</span><span class="lines">@@ -13,14 +13,14 @@
</span><span class="cx"> $space_used = get_dirsize( BLOGUPLOADDIR );
</span><span class="cx"> $space_left = $space_allowed - $space_used;
</span><span class="cx"> $file_size = filesize( $file['tmp_name'] );
</span><del>- if( $space_left < $file_size )
</del><ins>+ if ( $space_left < $file_size )
</ins><span class="cx"> $file['error'] = sprintf( __( 'Not enough space to upload. %1$s Kb needed.' ), number_format( ($file_size - $space_left) /1024 ) );
</span><del>- if( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
</del><ins>+ if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
</ins><span class="cx"> $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s Kb in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
</span><del>- if( upload_is_user_over_quota( false ) ) {
</del><ins>+ if ( upload_is_user_over_quota( false ) ) {
</ins><span class="cx"> $file['error'] = __('You have used your space quota. Please delete files before uploading.');
</span><span class="cx"> }
</span><del>- if( $file['error'] != '0' )
</del><ins>+ if ( $file['error'] != '0' )
</ins><span class="cx"> wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
</span><span class="cx">
</span><span class="cx"> return $file;
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> $blogs = get_site_option( "blog_list" );
</span><span class="cx"> if ( is_array( $blogs ) ) {
</span><span class="cx"> foreach( $blogs as $n => $blog ) {
</span><del>- if( $blog[ 'blog_id' ] == $blog_id ) {
</del><ins>+ if ( $blog[ 'blog_id' ] == $blog_id ) {
</ins><span class="cx"> unset( $blogs[ $n ] );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function confirm_delete_users( $users ) {
</span><del>- if( !is_array( $users ) )
</del><ins>+ if ( !is_array( $users ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> echo '<p>' . __( 'Transfer posts before deleting users:' ) . '</p>';
</span><span class="lines">@@ -147,25 +147,25 @@
</span><span class="cx"> echo '<input type="hidden" name="alluser_transfer_delete" />';
</span><span class="cx"> wp_nonce_field( 'allusers' );
</span><span class="cx"> foreach ( (array) $_POST['allusers'] as $key => $val ) {
</span><del>- if( $val != '' && $val != '0' ) {
</del><ins>+ if ( $val != '' && $val != '0' ) {
</ins><span class="cx"> $user = new WP_User( $val );
</span><span class="cx"> if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) {
</span><span class="cx"> wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a site admnistrator.' ), $user->user_login ) );
</span><span class="cx"> }
</span><span class="cx"> echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
</span><span class="cx"> $blogs = get_blogs_of_user( $val, true );
</span><del>- if( !empty( $blogs ) ) {
</del><ins>+ if ( !empty( $blogs ) ) {
</ins><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span><span class="cx"> $blog_users = get_users_of_blog( $details->userblog_id );
</span><del>- if( is_array( $blog_users ) && !empty( $blog_users ) ) {
</del><ins>+ if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
</ins><span class="cx"> echo "<p><a href='http://{$details->domain}{$details->path}'>{$details->blogname}</a> ";
</span><span class="cx"> echo "<select name='blog[$val][{$key}]'>";
</span><span class="cx"> $out = '';
</span><span class="cx"> foreach( $blog_users as $user ) {
</span><del>- if( $user->user_id != $val )
</del><ins>+ if ( $user->user_id != $val )
</ins><span class="cx"> $out .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
</span><span class="cx"> }
</span><del>- if( $out == '' )
</del><ins>+ if ( $out == '' )
</ins><span class="cx"> $out = "<option value='1'>admin</option>";
</span><span class="cx"> echo $out;
</span><span class="cx"> echo "</select>\n";
</span><span class="lines">@@ -182,17 +182,17 @@
</span><span class="cx"> function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
</span><span class="cx"> $themes = get_themes();
</span><span class="cx">
</span><del>- if( $blog_id != 0 )
</del><ins>+ if ( $blog_id != 0 )
</ins><span class="cx"> switch_to_blog( $blog_id );
</span><span class="cx">
</span><span class="cx"> $blog_allowed_themes = get_option( "allowedthemes" );
</span><del>- if( !is_array( $blog_allowed_themes ) || empty( $blog_allowed_themes ) ) { // convert old allowed_themes to new allowedthemes
</del><ins>+ if ( !is_array( $blog_allowed_themes ) || empty( $blog_allowed_themes ) ) { // convert old allowed_themes to new allowedthemes
</ins><span class="cx"> $blog_allowed_themes = get_option( "allowed_themes" );
</span><span class="cx">
</span><del>- if( is_array( $blog_allowed_themes ) ) {
</del><ins>+ if ( is_array( $blog_allowed_themes ) ) {
</ins><span class="cx"> foreach( (array) $themes as $key => $theme ) {
</span><span class="cx"> $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
</span><del>- if( isset( $blog_allowed_themes[ $key ] ) == true ) {
</del><ins>+ if ( isset( $blog_allowed_themes[ $key ] ) == true ) {
</ins><span class="cx"> $blog_allowedthemes[ $theme_key ] = 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( $blog_id != 0 )
</del><ins>+ if ( $blog_id != 0 )
</ins><span class="cx"> restore_current_blog();
</span><span class="cx">
</span><span class="cx"> return $blog_allowed_themes;
</span><span class="lines">@@ -256,9 +256,9 @@
</span><span class="cx">
</span><span class="cx"> function update_profile_email() {
</span><span class="cx"> global $current_user, $wpdb;
</span><del>- if( isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
</del><ins>+ if ( isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
</ins><span class="cx"> $new_email = get_option( $current_user->ID . '_new_email' );
</span><del>- if( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
</del><ins>+ if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
</ins><span class="cx"> $user->ID = $current_user->ID;
</span><span class="cx"> $user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
</span><span class="cx"> if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
</span><span class="lines">@@ -277,16 +277,16 @@
</span><span class="cx"> if ( ! is_object($errors) )
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx">
</span><del>- if( $current_user->id != $_POST[ 'user_id' ] )
</del><ins>+ if ( $current_user->id != $_POST[ 'user_id' ] )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if( $current_user->user_email != $_POST[ 'email' ] ) {
</del><ins>+ if ( $current_user->user_email != $_POST[ 'email' ] ) {
</ins><span class="cx"> if ( !is_email( $_POST[ 'email' ] ) ) {
</span><span class="cx"> $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST[ 'email' ] ) ) ) {
</del><ins>+ if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST[ 'email' ] ) ) ) {
</ins><span class="cx"> $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address is already used." ), array( 'form-field' => 'email' ) );
</span><span class="cx"> delete_option( $current_user->ID . '_new_email' );
</span><span class="cx"> return;
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx">
</span><span class="cx"> function new_user_email_admin_notice() {
</span><span class="cx"> global $current_user;
</span><del>- if( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET[ 'updated' ] ) && $email = get_option( $current_user->ID . '_new_email' ) )
</del><ins>+ if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET[ 'updated' ] ) && $email = get_option( $current_user->ID . '_new_email' ) )
</ins><span class="cx"> echo "<div id='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email[ 'newemail' ] ) . "</div>";
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'new_user_email_admin_notice' );
</span><span class="lines">@@ -335,14 +335,14 @@
</span><span class="cx"> function get_site_allowed_themes() {
</span><span class="cx"> $themes = get_themes();
</span><span class="cx"> $allowed_themes = get_site_option( 'allowedthemes' );
</span><del>- if( !is_array( $allowed_themes ) || empty( $allowed_themes ) ) {
</del><ins>+ if ( !is_array( $allowed_themes ) || empty( $allowed_themes ) ) {
</ins><span class="cx"> $allowed_themes = get_site_option( "allowed_themes" ); // convert old allowed_themes format
</span><del>- if( !is_array( $allowed_themes ) ) {
</del><ins>+ if ( !is_array( $allowed_themes ) ) {
</ins><span class="cx"> $allowed_themes = array();
</span><span class="cx"> } else {
</span><span class="cx"> foreach( (array) $themes as $key => $theme ) {
</span><span class="cx"> $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
</span><del>- if( isset( $allowed_themes[ $key ] ) == true ) {
</del><ins>+ if ( isset( $allowed_themes[ $key ] ) == true ) {
</ins><span class="cx"> $allowedthemes[ $theme_key ] = 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -354,9 +354,9 @@
</span><span class="cx">
</span><span class="cx"> function get_space_allowed() {
</span><span class="cx"> $spaceAllowed = get_option("blog_upload_space");
</span><del>- if( $spaceAllowed == false )
</del><ins>+ if ( $spaceAllowed == false )
</ins><span class="cx"> $spaceAllowed = get_site_option("blog_upload_space");
</span><del>- if( empty($spaceAllowed) || !is_numeric($spaceAllowed) )
</del><ins>+ if ( empty($spaceAllowed) || !is_numeric($spaceAllowed) )
</ins><span class="cx"> $spaceAllowed = 50;
</span><span class="cx">
</span><span class="cx"> return $spaceAllowed;
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> if ($used > $space) $percentused = '100';
</span><span class="cx"> else $percentused = ( $used / $space ) * 100;
</span><span class="cx">
</span><del>- if( $space > 1000 ) {
</del><ins>+ if ( $space > 1000 ) {
</ins><span class="cx"> $space = number_format( $space / 1024 );
</span><span class="cx"> $space .= __('GB');
</span><span class="cx"> } else {
</span><span class="lines">@@ -407,13 +407,13 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-if( current_user_can('edit_posts') )
</del><ins>+if ( current_user_can('edit_posts') )
</ins><span class="cx"> add_action('activity_box_end', 'dashboard_quota');
</span><span class="cx">
</span><span class="cx"> // Edit blog upload space setting on Edit Blog page
</span><span class="cx"> function upload_space_setting( $id ) {
</span><span class="cx"> $quota = get_blog_option($id, "blog_upload_space");
</span><del>- if( !$quota )
</del><ins>+ if ( !$quota )
</ins><span class="cx"> $quota = '';
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -430,11 +430,11 @@
</span><span class="cx">
</span><span class="cx"> $wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
</span><span class="cx">
</span><del>- if( $refresh == 1 )
</del><ins>+ if ( $refresh == 1 )
</ins><span class="cx"> refresh_user_details($id);
</span><span class="cx">
</span><del>- if( $pref == 'spam' ) {
- if( $value == 1 )
</del><ins>+ if ( $pref == 'spam' ) {
+ if ( $value == 1 )
</ins><span class="cx"> do_action( "make_spam_user", $id );
</span><span class="cx"> else
</span><span class="cx"> do_action( "make_ham_user", $id );
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> $dir->close();
</span><span class="cx"> $size = $size / 1024 / 1024;
</span><span class="cx">
</span><del>- if( ($spaceAllowed - $size) <= 0 ) {
</del><ins>+ if ( ($spaceAllowed - $size) <= 0 ) {
</ins><span class="cx"> wp_die( __('Sorry, you must delete files before you can upload any more.') );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -496,8 +496,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sync_category_tag_slugs( $term, $taxonomy ) {
</span><del>- if( $taxonomy == 'category' || $taxonomy == 'post_tag' ) {
- if( is_object( $term ) ) {
</del><ins>+ if ( $taxonomy == 'category' || $taxonomy == 'post_tag' ) {
+ if ( is_object( $term ) ) {
</ins><span class="cx"> $term->slug = sanitize_title( $term->name );
</span><span class="cx"> } else {
</span><span class="cx"> $term[ 'slug' ] = sanitize_title( $term[ 'name' ] );
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx">
</span><span class="cx"> $blog = get_active_blog_for_user( $current_user->ID );
</span><span class="cx"> $dashboard_blog = get_dashboard_blog();
</span><del>- if( is_object( $blog ) ) {
</del><ins>+ if ( is_object( $blog ) ) {
</ins><span class="cx"> $protocol = ( is_ssl() ? 'https://' : 'http://' );
</span><span class="cx"> wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
</span><span class="cx"> exit;
</span><span class="lines">@@ -625,17 +625,17 @@
</span><span class="cx"> $media_title = __('Add Media');
</span><span class="cx"> $mu_media_buttons = get_site_option( 'mu_media_buttons' );
</span><span class="cx"> $out = '';
</span><del>- if( $mu_media_buttons[ 'image' ] ) {
</del><ins>+ if ( $mu_media_buttons[ 'image' ] ) {
</ins><span class="cx"> $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&amp;type=image");
</span><span class="cx"> $image_title = __('Add an Image');
</span><span class="cx"> $out .= "<a href='{$image_upload_iframe_src}&amp;TB_iframe=true' id='add_image' class='thickbox' title='$image_title'><img src='images/media-button-image.gif' alt='$image_title' /></a>";
</span><span class="cx"> }
</span><del>- if( $mu_media_buttons[ 'video' ] ) {
</del><ins>+ if ( $mu_media_buttons[ 'video' ] ) {
</ins><span class="cx"> $video_upload_iframe_src = apply_filters('video_upload_iframe_src', "$media_upload_iframe_src&amp;type=video");
</span><span class="cx"> $video_title = __('Add Video');
</span><span class="cx"> $out .= "<a href='{$video_upload_iframe_src}&amp;TB_iframe=true' id='add_video' class='thickbox' title='$video_title'><img src='images/media-button-video.gif' alt='$video_title' /></a>";
</span><span class="cx"> }
</span><del>- if( $mu_media_buttons[ 'audio' ] ) {
</del><ins>+ if ( $mu_media_buttons[ 'audio' ] ) {
</ins><span class="cx"> $audio_upload_iframe_src = apply_filters('audio_upload_iframe_src', "$media_upload_iframe_src&amp;type=audio");
</span><span class="cx"> $audio_title = __('Add Audio');
</span><span class="cx"> $out .= "<a href='{$audio_upload_iframe_src}&amp;TB_iframe=true' id='add_audio' class='thickbox' title='$audio_title'><img src='images/media-button-music.gif' alt='$audio_title' /></a>";
</span><span class="lines">@@ -648,15 +648,15 @@
</span><span class="cx">
</span><span class="cx"> /* Warn the admin if SECRET SALT information is missing from wp-config.php */
</span><span class="cx"> function secret_salt_warning() {
</span><del>- if( !is_super_admin() )
</del><ins>+ if ( !is_super_admin() )
</ins><span class="cx"> return;
</span><span class="cx"> $secret_keys = array( 'NONCE_KEY', 'AUTH_KEY', 'AUTH_SALT', 'LOGGED_IN_KEY', 'LOGGED_IN_SALT', 'SECURE_AUTH_KEY', 'SECURE_AUTH_SALT' );
</span><span class="cx"> $out = '';
</span><span class="cx"> foreach( $secret_keys as $key ) {
</span><del>- if( !defined( $key ) )
</del><ins>+ if ( !defined( $key ) )
</ins><span class="cx"> $out .= "define( '$key', '" . wp_generate_password() . wp_generate_password() . "' );<br />";
</span><span class="cx"> }
</span><del>- if( $out != '' ) {
</del><ins>+ if ( $out != '' ) {
</ins><span class="cx"> $msg = sprintf( __( 'Warning! WordPress encrypts user cookies, but you must add the following lines to <strong>%swp-config.php</strong> for it to be more secure.<br />Please add the code before the line, <code>/* That\'s all, stop editing! Happy blogging. */</code>' ), ABSPATH );
</span><span class="cx"> $msg .= "<blockquote>$out</blockquote>";
</span><span class="cx">
</span><span class="lines">@@ -686,19 +686,19 @@
</span><span class="cx">
</span><span class="cx"> function admin_notice_feed() {
</span><span class="cx"> global $current_user;
</span><del>- if( substr( $_SERVER[ 'PHP_SELF' ], -19 ) != '/wp-admin/index.php' )
</del><ins>+ if ( substr( $_SERVER[ 'PHP_SELF' ], -19 ) != '/wp-admin/index.php' )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if( isset( $_GET[ 'feed_dismiss' ] ) )
</del><ins>+ if ( isset( $_GET[ 'feed_dismiss' ] ) )
</ins><span class="cx"> update_user_option( $current_user->id, 'admin_feed_dismiss', $_GET[ 'feed_dismiss' ], true );
</span><span class="cx">
</span><span class="cx"> $url = get_site_option( 'admin_notice_feed' );
</span><del>- if( $url == '' )
</del><ins>+ if ( $url == '' )
</ins><span class="cx"> return;
</span><span class="cx"> include_once( ABSPATH . 'wp-includes/rss.php' );
</span><span class="cx"> $rss = @fetch_rss( $url );
</span><del>- if( isset($rss->items) && 1 <= count($rss->items) ) {
- if( md5( $rss->items[0][ 'title' ] ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) )
</del><ins>+ if ( isset($rss->items) && 1 <= count($rss->items) ) {
+ if ( md5( $rss->items[0][ 'title' ] ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) )
</ins><span class="cx"> return;
</span><span class="cx"> $item = $rss->items[0];
</span><span class="cx"> $msg = "<h3>" . wp_specialchars( $item[ 'title' ] ) . "</h3>\n";
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> $link = clean_url( strip_tags( $item['link'] ) );
</span><span class="cx"> $msg .= "<p>" . $content . " <a href='$link'>" . __( 'Read More' ) . "</a> <a href='index.php?feed_dismiss=" . md5( $item[ 'title' ] ) . "'>" . __( "Dismiss" ) . "</a></p>";
</span><span class="cx"> echo "<div class='updated fade'>$msg</div>";
</span><del>- } elseif( is_super_admin() ) {
</del><ins>+ } elseif ( is_super_admin() ) {
</ins><span class="cx"> printf("<div id='update-nag'>" . __("Your feed at %s is empty.") . "</div>", wp_specialchars( $url ));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -722,7 +722,7 @@
</span><span class="cx">
</span><span class="cx"> function site_admin_notice() {
</span><span class="cx"> global $current_user, $wp_db_version;
</span><del>- if( !is_super_admin() )
</del><ins>+ if ( !is_super_admin() )
</ins><span class="cx"> return false;
</span><span class="cx"> printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login);
</span><span class="cx"> if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
</span><span class="lines">@@ -732,13 +732,13 @@
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="cx">
</span><span class="cx"> function avoid_blog_page_permalink_collision( $data, $postarr ) {
</span><del>- if( is_subdomain_install() )
</del><ins>+ if ( is_subdomain_install() )
</ins><span class="cx"> return $data;
</span><del>- if( $data[ 'post_type' ] != 'page' )
</del><ins>+ if ( $data[ 'post_type' ] != 'page' )
</ins><span class="cx"> return $data;
</span><del>- if( !isset( $data[ 'post_name' ] ) || $data[ 'post_name' ] == '' )
</del><ins>+ if ( !isset( $data[ 'post_name' ] ) || $data[ 'post_name' ] == '' )
</ins><span class="cx"> return $data;
</span><del>- if( !is_main_blog() )
</del><ins>+ if ( !is_main_blog() )
</ins><span class="cx"> return $data;
</span><span class="cx">
</span><span class="cx"> $post_name = $data[ 'post_name' ];
</span><span class="lines">@@ -747,7 +747,7 @@
</span><span class="cx"> $post_name .= mt_rand( 1, 10 );
</span><span class="cx"> $c ++;
</span><span class="cx"> }
</span><del>- if( $post_name != $data[ 'post_name' ] ) {
</del><ins>+ if ( $post_name != $data[ 'post_name' ] ) {
</ins><span class="cx"> $data[ 'post_name' ] = $post_name;
</span><span class="cx"> }
</span><span class="cx"> return $data;
</span><span class="lines">@@ -1033,7 +1033,7 @@
</span><span class="cx">
</span><span class="cx"> function remove_edit_plugin_link( $action_links, $plugin_file, $plugin_data, $context ) {
</span><span class="cx"> foreach( $action_links as $t => $link ) {
</span><del>- if( !strpos( $link, __( "Open this file in the Plugin Editor" ) ) )
</del><ins>+ if ( !strpos( $link, __( "Open this file in the Plugin Editor" ) ) )
</ins><span class="cx"> $links[ $t ] = $link;
</span><span class="cx"> }
</span><span class="cx"> return $links;
</span><span class="lines">@@ -1050,25 +1050,25 @@
</span><span class="cx"> <?php
</span><span class="cx"> $all_blogs = get_blogs_of_user( $current_user->ID );
</span><span class="cx"> $primary_blog = get_usermeta($current_user->ID, 'primary_blog');
</span><del>- if( count( $all_blogs ) > 1 ) {
</del><ins>+ if ( count( $all_blogs ) > 1 ) {
</ins><span class="cx"> $found = false;
</span><span class="cx"> ?>
</span><span class="cx"> <select name="primary_blog">
</span><span class="cx"> <?php foreach( (array) $all_blogs as $blog ) {
</span><del>- if( $primary_blog == $blog->userblog_id )
</del><ins>+ if ( $primary_blog == $blog->userblog_id )
</ins><span class="cx"> $found = true;
</span><del>- ?><option value='<?php echo $blog->userblog_id ?>'<?php if( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option><?php
</del><ins>+ ?><option value='<?php echo $blog->userblog_id ?>'<?php if ( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option><?php
</ins><span class="cx"> } ?>
</span><span class="cx"> </select>
</span><span class="cx"> <?php
</span><del>- if( !$found ) {
</del><ins>+ if ( !$found ) {
</ins><span class="cx"> $blog = array_shift( $all_blogs );
</span><span class="cx"> update_usermeta( $current_user->ID, 'primary_blog', $blog->userblog_id );
</span><span class="cx"> }
</span><del>- } elseif( count( $all_blogs ) == 1 ) {
</del><ins>+ } elseif ( count( $all_blogs ) == 1 ) {
</ins><span class="cx"> $blog = array_shift( $all_blogs );
</span><span class="cx"> echo $blog->domain;
</span><del>- if( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
</del><ins>+ if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
</ins><span class="cx"> update_usermeta( $current_user->ID, 'primary_blog', $blog->userblog_id );
</span><span class="cx"> } else {
</span><span class="cx"> echo "N/A";
</span><span class="lines">@@ -1081,7 +1081,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action ( 'myblogs_allblogs_options', 'choose_primary_blog' );
</span><span class="cx">
</span><del>-if( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) ) {
</del><ins>+if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) ) {
</ins><span class="cx"> add_action( 'admin_init', 'update_profile_email' );
</span><span class="cx"> add_action( 'admin_init', 'profile_page_email_warning_ob_start' );
</span><span class="cx"> }
</span><span class="lines">@@ -1132,7 +1132,7 @@
</span><span class="cx"> global $current_user;
</span><span class="cx">
</span><span class="cx"> $blogs = get_blogs_of_user( $current_user->ID );
</span><del>- if( !$blogs || ( is_array( $blogs ) && empty( $blogs ) ) ) {
</del><ins>+ if ( !$blogs || ( is_array( $blogs ) && empty( $blogs ) ) ) {
</ins><span class="cx"> wp_die( __( 'You must be a member of at least one blog to use this page.' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1140,7 +1140,7 @@
</span><span class="cx"> $title = apply_filters( 'my_blogs_title', __( 'My Blogs' ) );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>- <?php if( $_GET[ 'updated' ] ) { ?>
</del><ins>+ <?php if ( $_GET[ 'updated' ] ) { ?>
</ins><span class="cx"> <div id="message" class="updated fade"><p><strong><?php _e( 'Your blog options have been updated.' ); ?></strong></p></div>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <?php screen_icon(); ?>
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/plugin-install.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> */
</span><span class="cx"> function plugins_api($action, $args = null) {
</span><span class="cx">
</span><del>- if( is_array($args) )
</del><ins>+ if ( is_array($args) )
</ins><span class="cx"> $args = (object)$args;
</span><span class="cx">
</span><span class="cx"> if ( !isset($args->per_page) )
</span><span class="lines">@@ -325,10 +325,10 @@
</span><span class="cx">
</span><span class="cx"> <tbody class="plugins">
</span><span class="cx"> <?php
</span><del>- if( empty($plugins) )
</del><ins>+ if ( empty($plugins) )
</ins><span class="cx"> echo '<tr><td colspan="5">', __('No plugins match your request.'), '</td></tr>';
</span><span class="cx">
</span><del>- foreach( (array) $plugins as $plugin ){
</del><ins>+ foreach ( (array) $plugins as $plugin ){
</ins><span class="cx"> if ( is_object($plugin) )
</span><span class="cx"> $plugin = (array) $plugin;
</span><span class="cx">
</span><span class="lines">@@ -349,12 +349,12 @@
</span><span class="cx"> $name = strip_tags($title . ' ' . $version);
</span><span class="cx">
</span><span class="cx"> $author = $plugin['author'];
</span><del>- if( ! empty($plugin['author']) )
</del><ins>+ if ( ! empty($plugin['author']) )
</ins><span class="cx"> $author = ' <cite>' . sprintf( __('By %s'), $author ) . '.</cite>';
</span><span class="cx">
</span><span class="cx"> $author = wp_kses($author, $plugins_allowedtags);
</span><span class="cx">
</span><del>- if( isset($plugin['homepage']) )
</del><ins>+ if ( isset($plugin['homepage']) )
</ins><span class="cx"> $title = '<a target="_blank" href="' . esc_attr($plugin['homepage']) . '">' . $title . '</a>';
</span><span class="cx">
</span><span class="cx"> $action_links = array();
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> $api->$key = wp_kses($api->$key, $plugins_allowedtags);
</span><span class="cx">
</span><span class="cx"> $section = isset($_REQUEST['section']) ? stripslashes( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
</span><del>- if( empty($section) || ! isset($api->sections[ $section ]) )
</del><ins>+ if ( empty($section) || ! isset($api->sections[ $section ]) )
</ins><span class="cx"> $section = array_shift( $section_titles = array_keys((array)$api->sections) );
</span><span class="cx">
</span><span class="cx"> iframe_header( __('Plugin Install') );
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/plugin.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> function _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup = true, $translate = true) {
</span><span class="cx">
</span><span class="cx"> //Translate fields
</span><del>- if( $translate && ! empty($plugin_data['TextDomain']) ) {
- if( ! empty( $plugin_data['DomainPath'] ) )
</del><ins>+ if ( $translate && ! empty($plugin_data['TextDomain']) ) {
+ if ( ! empty( $plugin_data['DomainPath'] ) )
</ins><span class="cx"> load_plugin_textdomain($plugin_data['TextDomain'], false, dirname($plugin_file). $plugin_data['DomainPath']);
</span><span class="cx"> else
</span><span class="cx"> load_plugin_textdomain($plugin_data['TextDomain'], false, dirname($plugin_file));
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> $plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
</span><span class="cx">
</span><span class="cx"> $plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
</span><del>- if( ! empty($plugin_data['Author']) )
</del><ins>+ if ( ! empty($plugin_data['Author']) )
</ins><span class="cx"> $plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> $wp_plugins = array ();
</span><span class="cx"> $plugin_root = WP_PLUGIN_DIR;
</span><del>- if( !empty($plugin_folder) )
</del><ins>+ if ( !empty($plugin_folder) )
</ins><span class="cx"> $plugin_root .= $plugin_folder;
</span><span class="cx">
</span><span class="cx"> // Files in wp-content/plugins directory
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $plugins as $plugin ) {
</span><span class="cx"> $plugin = plugin_basename($plugin);
</span><del>- if( ! is_plugin_active($plugin) )
</del><ins>+ if ( ! is_plugin_active($plugin) )
</ins><span class="cx"> continue;
</span><span class="cx"> if ( ! $silent )
</span><span class="cx"> do_action( 'deactivate_plugin', trim( $plugin ) );
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> function delete_plugins($plugins, $redirect = '' ) {
</span><span class="cx"> global $wp_filesystem;
</span><span class="cx">
</span><del>- if( empty($plugins) )
</del><ins>+ if ( empty($plugins) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $checked = array();
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> if ( false === ($credentials = request_filesystem_credentials($url)) ) {
</span><span class="cx"> $data = ob_get_contents();
</span><span class="cx"> ob_end_clean();
</span><del>- if( ! empty($data) ){
</del><ins>+ if ( ! empty($data) ){
</ins><span class="cx"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> echo $data;
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-footer.php');
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
</span><span class="cx"> $data = ob_get_contents();
</span><span class="cx"> ob_end_clean();
</span><del>- if( ! empty($data) ){
</del><ins>+ if ( ! empty($data) ){
</ins><span class="cx"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> echo $data;
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-footer.php');
</span><span class="lines">@@ -1064,7 +1064,7 @@
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function add_option_whitelist( $new_options, $options = '' ) {
</span><del>- if( $options == '' ) {
</del><ins>+ if ( $options == '' ) {
</ins><span class="cx"> global $whitelist_options;
</span><span class="cx"> } else {
</span><span class="cx"> $whitelist_options = $options;
</span><span class="lines">@@ -1094,7 +1094,7 @@
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function remove_option_whitelist( $del_options, $options = '' ) {
</span><del>- if( $options == '' ) {
</del><ins>+ if ( $options == '' ) {
</ins><span class="cx"> global $whitelist_options;
</span><span class="cx"> } else {
</span><span class="cx"> $whitelist_options = $options;
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx"> foreach( $keys as $key ) {
</span><span class="cx"> if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
</span><span class="cx"> $pos = array_search( $key, $whitelist_options[ $page ] );
</span><del>- if( $pos !== false )
</del><ins>+ if ( $pos !== false )
</ins><span class="cx"> unset( $whitelist_options[ $page ][ $pos ] );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/post.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> */
</span><span class="cx"> function write_post() {
</span><span class="cx"> $result = wp_write_post();
</span><del>- if( is_wp_error( $result ) )
</del><ins>+ if ( is_wp_error( $result ) )
</ins><span class="cx"> wp_die( $result->get_error_message() );
</span><span class="cx"> else
</span><span class="cx"> return $result;
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/template.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -1307,13 +1307,13 @@
</span><span class="cx"> <div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
</span><span class="cx"> <div class="post_password">' . esc_html( $post->post_password ) . '</div>';
</span><span class="cx">
</span><del>- if( $post->post_type == 'page' )
</del><ins>+ if ( $post->post_type == 'page' )
</ins><span class="cx"> echo '
</span><span class="cx"> <div class="post_parent">' . $post->post_parent . '</div>
</span><span class="cx"> <div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>
</span><span class="cx"> <div class="menu_order">' . $post->menu_order . '</div>';
</span><span class="cx">
</span><del>- if( $post->post_type == 'post' )
</del><ins>+ if ( $post->post_type == 'post' )
</ins><span class="cx"> echo '
</span><span class="cx"> <div class="tags_input">' . esc_html( str_replace( ',', ', ', get_tags_to_edit($post->ID) ) ) . '</div>
</span><span class="cx"> <div class="post_category">' . implode( ',', wp_get_post_categories( $post->ID ) ) . '</div>
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/theme.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> request_filesystem_credentials($url, '', true); // Failed to connect, Error and request again
</span><span class="cx"> $data = ob_get_contents();
</span><span class="cx"> ob_end_clean();
</span><del>- if( ! empty($data) ){
</del><ins>+ if ( ! empty($data) ) {
</ins><span class="cx"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> echo $data;
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-footer.php');
</span></span></pre></div>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/update.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function core_update_footer( $msg = '' ) {
</span><del>- if( is_multisite() && !is_super_admin() )
</del><ins>+ if ( is_multisite() && !is_super_admin() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('manage_options') )
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> add_filter( 'update_footer', 'core_update_footer' );
</span><span class="cx">
</span><span class="cx"> function update_nag() {
</span><del>- if( is_multisite() && !is_super_admin() )
</del><ins>+ if ( is_multisite() && !is_super_admin() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> global $pagenow;
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> // Called directly from dashboard
</span><span class="cx"> function update_right_now_message() {
</span><del>- if( is_multisite() && !is_super_admin() )
</del><ins>+ if ( is_multisite() && !is_super_admin() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $cur = get_preferred_from_update_core();
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_update_plugin($plugin, $feedback = '') {
</span><del>- if( is_multisite() && !is_super_admin() )
</del><ins>+ if ( is_multisite() && !is_super_admin() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/includes/upgrade.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> if ( $wp_db_version == $wp_current_db_version )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if( ! is_blog_installed() )
</del><ins>+ if ( ! is_blog_installed() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> wp_check_mysql_version();
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx">
</span><span class="cx"> // populate comment_count field of posts table
</span><span class="cx"> $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
</span><del>- if( is_array( $comments ) )
</del><ins>+ if ( is_array( $comments ) )
</ins><span class="cx"> foreach ($comments as $comment)
</span><span class="cx"> $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
</span><span class="cx">
</span><span class="lines">@@ -1199,9 +1199,9 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> // Separate individual queries into an array
</span><del>- if( !is_array($queries) ) {
</del><ins>+ if ( !is_array($queries) ) {
</ins><span class="cx"> $queries = explode( ';', $queries );
</span><del>- if('' == $queries[count($queries) - 1]) array_pop($queries);
</del><ins>+ if ('' == $queries[count($queries) - 1]) array_pop($queries);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $cqueries = array(); // Creation Queries
</span><span class="lines">@@ -1210,30 +1210,26 @@
</span><span class="cx">
</span><span class="cx"> // Create a tablename index for an array ($cqueries) of queries
</span><span class="cx"> foreach($queries as $qry) {
</span><del>- if(preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
</del><ins>+ if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
</ins><span class="cx"> $cqueries[trim( strtolower($matches[1]), '`' )] = $qry;
</span><span class="cx"> $for_update[$matches[1]] = 'Created table '.$matches[1];
</span><del>- }
- else if(preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
</del><ins>+ } else if (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
</ins><span class="cx"> array_unshift($cqueries, $qry);
</span><del>- }
- else if(preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
</del><ins>+ } else if (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
</ins><span class="cx"> $iqueries[] = $qry;
</span><del>- }
- else if(preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
</del><ins>+ } else if (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
</ins><span class="cx"> $iqueries[] = $qry;
</span><del>- }
- else {
</del><ins>+ } else {
</ins><span class="cx"> // Unrecognized query type
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Check to see which tables and fields exist
</span><del>- if($tables = $wpdb->get_col('SHOW TABLES;')) {
</del><ins>+ if ($tables = $wpdb->get_col('SHOW TABLES;')) {
</ins><span class="cx"> // For every table in the database
</span><del>- foreach($tables as $table) {
</del><ins>+ foreach ($tables as $table) {
</ins><span class="cx"> // If a table query exists for the database table...
</span><del>- if( array_key_exists(strtolower($table), $cqueries) ) {
</del><ins>+ if ( array_key_exists(strtolower($table), $cqueries) ) {
</ins><span class="cx"> // Clear the field and index arrays
</span><span class="cx"> unset($cfields);
</span><span class="cx"> unset($indices);
</span><span class="lines">@@ -1247,15 +1243,14 @@
</span><span class="cx"> //echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
</span><span class="cx">
</span><span class="cx"> // For every field line specified in the query
</span><del>- foreach($flds as $fld) {
</del><ins>+ foreach ($flds as $fld) {
</ins><span class="cx"> // Extract the field name
</span><span class="cx"> preg_match("|^([^ ]*)|", trim($fld), $fvals);
</span><span class="cx"> $fieldname = trim( $fvals[1], '`' );
</span><span class="cx">
</span><span class="cx"> // Verify the found field name
</span><span class="cx"> $validfield = true;
</span><del>- switch(strtolower($fieldname))
- {
</del><ins>+ switch (strtolower($fieldname)) {
</ins><span class="cx"> case '':
</span><span class="cx"> case 'primary':
</span><span class="cx"> case 'index':
</span><span class="lines">@@ -1269,7 +1264,7 @@
</span><span class="cx"> $fld = trim($fld);
</span><span class="cx">
</span><span class="cx"> // If it's a valid field, add it to the field array
</span><del>- if($validfield) {
</del><ins>+ if ($validfield) {
</ins><span class="cx"> $cfields[strtolower($fieldname)] = trim($fld, ", \n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1278,15 +1273,15 @@
</span><span class="cx"> $tablefields = $wpdb->get_results("DESCRIBE {$table};");
</span><span class="cx">
</span><span class="cx"> // For every field in the table
</span><del>- foreach($tablefields as $tablefield) {
</del><ins>+ foreach ($tablefields as $tablefield) {
</ins><span class="cx"> // If the table field exists in the field array...
</span><del>- if(array_key_exists(strtolower($tablefield->Field), $cfields)) {
</del><ins>+ if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
</ins><span class="cx"> // Get the field type from the query
</span><span class="cx"> preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
</span><span class="cx"> $fieldtype = $matches[1];
</span><span class="cx">
</span><span class="cx"> // Is actual field type different from the field type in query?
</span><del>- if($tablefield->Type != $fieldtype) {
</del><ins>+ if ($tablefield->Type != $fieldtype) {
</ins><span class="cx"> // Add a query to change the column type
</span><span class="cx"> $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
</span><span class="cx"> $for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
</span><span class="lines">@@ -1294,10 +1289,9 @@
</span><span class="cx">
</span><span class="cx"> // Get the default value from the array
</span><span class="cx"> //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
</span><del>- if(preg_match("| DEFAULT '(.*)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
</del><ins>+ if (preg_match("| DEFAULT '(.*)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
</ins><span class="cx"> $default_value = $matches[1];
</span><del>- if($tablefield->Default != $default_value)
- {
</del><ins>+ if ($tablefield->Default != $default_value) {
</ins><span class="cx"> // Add a query to change the column's default value
</span><span class="cx"> $cqueries[] = "ALTER TABLE {$table} ALTER COLUMN {$tablefield->Field} SET DEFAULT '{$default_value}'";
</span><span class="cx"> $for_update[$table.'.'.$tablefield->Field] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
</span><span class="lines">@@ -1306,14 +1300,13 @@
</span><span class="cx">
</span><span class="cx"> // Remove the field from the array (so it's not added)
</span><span class="cx"> unset($cfields[strtolower($tablefield->Field)]);
</span><del>- }
- else {
</del><ins>+ } else {
</ins><span class="cx"> // This field exists in the table, but not in the creation queries?
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For every remaining field specified for the table
</span><del>- foreach($cfields as $fieldname => $fielddef) {
</del><ins>+ foreach ($cfields as $fieldname => $fielddef) {
</ins><span class="cx"> // Push a query line into $cqueries that adds the field to that table
</span><span class="cx"> $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
</span><span class="cx"> $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
</span><span class="lines">@@ -1323,12 +1316,12 @@
</span><span class="cx"> // Fetch the table index structure from the database
</span><span class="cx"> $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
</span><span class="cx">
</span><del>- if($tableindices) {
</del><ins>+ if ($tableindices) {
</ins><span class="cx"> // Clear the index array
</span><span class="cx"> unset($index_ary);
</span><span class="cx">
</span><span class="cx"> // For every index in the table
</span><del>- foreach($tableindices as $tableindex) {
</del><ins>+ foreach ($tableindices as $tableindex) {
</ins><span class="cx"> // Add the index to the index data array
</span><span class="cx"> $keyname = $tableindex->Key_name;
</span><span class="cx"> $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
</span><span class="lines">@@ -1336,32 +1329,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For each actual index in the index array
</span><del>- foreach($index_ary as $index_name => $index_data) {
</del><ins>+ foreach ($index_ary as $index_name => $index_data) {
</ins><span class="cx"> // Build a create string to compare to the query
</span><span class="cx"> $index_string = '';
</span><del>- if($index_name == 'PRIMARY') {
</del><ins>+ if ($index_name == 'PRIMARY') {
</ins><span class="cx"> $index_string .= 'PRIMARY ';
</span><del>- }
- else if($index_data['unique']) {
</del><ins>+ } else if($index_data['unique']) {
</ins><span class="cx"> $index_string .= 'UNIQUE ';
</span><span class="cx"> }
</span><span class="cx"> $index_string .= 'KEY ';
</span><del>- if($index_name != 'PRIMARY') {
</del><ins>+ if ($index_name != 'PRIMARY') {
</ins><span class="cx"> $index_string .= $index_name;
</span><span class="cx"> }
</span><span class="cx"> $index_columns = '';
</span><span class="cx"> // For each column in the index
</span><del>- foreach($index_data['columns'] as $column_data) {
- if($index_columns != '') $index_columns .= ',';
</del><ins>+ foreach ($index_data['columns'] as $column_data) {
+ if ($index_columns != '') $index_columns .= ',';
</ins><span class="cx"> // Add the field to the column list string
</span><span class="cx"> $index_columns .= $column_data['fieldname'];
</span><del>- if($column_data['subpart'] != '') {
</del><ins>+ if ($column_data['subpart'] != '') {
</ins><span class="cx"> $index_columns .= '('.$column_data['subpart'].')';
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> // Add the column list to the index create string
</span><span class="cx"> $index_string .= ' ('.$index_columns.')';
</span><del>- if(!(($aindex = array_search($index_string, $indices)) === false)) {
</del><ins>+ if (!(($aindex = array_search($index_string, $indices)) === false)) {
</ins><span class="cx"> unset($indices[$aindex]);
</span><span class="cx"> //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
</span><span class="cx"> }
</span><span class="lines">@@ -1386,8 +1378,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $allqueries = array_merge($cqueries, $iqueries);
</span><del>- if($execute) {
- foreach($allqueries as $query) {
</del><ins>+ if ($execute) {
+ foreach ($allqueries as $query) {
</ins><span class="cx"> //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">".print_r($query, true)."</pre>\n";
</span><span class="cx"> $wpdb->query($query);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/ms-edit.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -204,10 +204,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $_POST['update_home_url'] == 'update' ) {
</span><del>- if( get_option( 'siteurl' ) != 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] )
</del><ins>+ if ( get_option( 'siteurl' ) != 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] )
</ins><span class="cx"> update_option( 'siteurl', 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] );
</span><span class="cx">
</span><del>- if( get_option( 'home' ) != 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] )
</del><ins>+ if ( get_option( 'home' ) != 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] )
</ins><span class="cx"> update_option( 'home', 'http://' . $_POST['blog']['domain'] . $_POST['blog']['path'] );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // remove user
</span><del>- if( is_array( $_POST[ 'blogusers' ] ) ) {
</del><ins>+ if ( is_array( $_POST[ 'blogusers' ] ) ) {
</ins><span class="cx"> reset( $_POST[ 'blogusers' ] );
</span><span class="cx"> foreach ( (array) $_POST[ 'blogusers' ] as $key => $val )
</span><span class="cx"> remove_user_from_blog( $key, $id );
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/ms-options.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Allow new registrations') ?></th>
</span><span class="cx"> <?php
</span><del>- if( !get_site_option('registration') )
</del><ins>+ if ( !get_site_option('registration') )
</ins><span class="cx"> update_site_option( 'registration', 'all' );
</span><span class="cx"> ?>
</span><span class="cx"> <td>
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> <label><input name="registration" type="radio" id="registration3" value='user' <?php echo get_site_option('registration') == 'user' ? 'checked="checked"' : ''; ?> /> <?php _e('Only user account can be created.'); ?></label><br />
</span><span class="cx"> <label><input name="registration" type="radio" id="registration4" value='blog' <?php echo get_site_option('registration') == 'blog' ? 'checked="checked"' : ''; ?> /> <?php _e('Only logged in users can create new blogs.'); ?></label><br />
</span><span class="cx"> <p><?php _e('Disable or enable registration and who or what can be registered. (Default=all)'); ?></p>
</span><del>- <?php if( is_subdomain_install() ) {
</del><ins>+ <?php if ( is_subdomain_install() ) {
</ins><span class="cx"> echo "<p>" . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant blog.') . "</p>";
</span><span class="cx"> } ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Registration notification') ?></th>
</span><span class="cx"> <?php
</span><del>- if( !get_site_option('registrationnotification') )
</del><ins>+ if ( !get_site_option('registrationnotification') )
</ins><span class="cx"> update_site_option( 'registrationnotification', 'yes' );
</span><span class="cx"> ?>
</span><span class="cx"> <td>
</span><span class="lines">@@ -201,16 +201,16 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Upload media button') ?></th>
</span><span class="cx"> <?php $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); ?>
</span><del>- <td><label><input type='checkbox' id="mu_media_buttons_image" name="mu_media_buttons[image]" value='1' <?php if( $mu_media_buttons[ 'image' ] ) { echo 'checked=checked '; } ?>/> <?php _e( 'Images' ); ?></label><br />
- <label><input type='checkbox' id="mu_media_buttons_video" name="mu_media_buttons[video]" value='1' <?php if( $mu_media_buttons[ 'video' ] ) { echo 'checked=checked '; } ?>/> <?php _e( 'Videos' ); ?></label><br />
- <label><input type='checkbox' id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value='1' <?php if( $mu_media_buttons[ 'audio' ] ) { echo 'checked=checked '; } ?>/> <?php _e( 'Music' ); ?></label><br />
</del><ins>+ <td><label><input type='checkbox' id="mu_media_buttons_image" name="mu_media_buttons[image]" value='1' <?php if ( $mu_media_buttons[ 'image' ] ) { echo 'checked=checked '; } ?>/> <?php _e( 'Images' ); ?></label><br />
+ <label><input type='checkbox' id="mu_media_buttons_video" name="mu_media_buttons[video]" value='1' <?php if ( $mu_media_buttons[ 'video' ] ) { echo 'checked=checked '; } ?>/> <?php _e( 'Videos' ); ?></label><br />
+ <label><input type='checkbox' id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value='1' <?php if ( $mu_media_buttons[ 'audio' ] ) { echo 'checked=checked '; } ?>/> <?php _e( 'Music' ); ?></label><br />
</ins><span class="cx"> <?php _e( 'The media upload buttons to display on the "Write Post" page. Make sure you update the "Upload File Types" below as well.' ); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Blog upload space check') ?></th>
</span><span class="cx"> <td>
</span><del>- <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='0' <?php if( !get_site_option( 'upload_space_check_disabled' ) ) { echo 'checked=checked '; } ?>/> <?php _e( 'Enabled' ); ?></label><br />
- <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='1' <?php if( get_site_option( 'upload_space_check_disabled' ) ) { echo 'checked=checked '; } ?>/> <?php _e( 'Disabled' ); ?></label><br />
</del><ins>+ <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='0' <?php if ( !get_site_option( 'upload_space_check_disabled' ) ) { echo 'checked=checked '; } ?>/> <?php _e( 'Enabled' ); ?></label><br />
+ <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='1' <?php if ( get_site_option( 'upload_space_check_disabled' ) ) { echo 'checked=checked '; } ?>/> <?php _e( 'Disabled' ); ?></label><br />
</ins><span class="cx"> <?php _e( 'By default there is a limit on the total size of files uploaded but it can be disabled here.' ); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> <th scope="row"><?php _e('Admin Notice Feed') ?></th>
</span><span class="cx"> <td><input name="admin_notice_feed" style="width: 95%" type="text" id="admin_notice_feed" value="<?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?>" size="80" /><br />
</span><span class="cx"> <?php _e( 'Display the latest post from this RSS or Atom feed on all blog dashboards. Leave blank to disable.' ); ?><br />
</span><del>- <?php if( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' )
</del><ins>+ <?php if ( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' )
</ins><span class="cx"> echo __( "A good one to use would be the feed from your main blog: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -251,12 +251,12 @@
</span><span class="cx"> <h3><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></h3>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php
</span><del>- if( is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) )
</del><ins>+ if ( is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) )
</ins><span class="cx"> while( ( $lang_file = readdir( $dh ) ) !== false )
</span><del>- if( substr( $lang_file, -3 ) == '.mo' )
</del><ins>+ if ( substr( $lang_file, -3 ) == '.mo' )
</ins><span class="cx"> $lang_files[] = $lang_file;
</span><span class="cx"> $lang = get_site_option('WPLANG');
</span><del>- if( is_array($lang_files) && !empty($lang_files) ) {
</del><ins>+ if ( is_array($lang_files) && !empty($lang_files) ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th width="33%"><?php _e('Default Language') ?></th>
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/ms-sites.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><?php _e('Path') ?></th>
</span><span class="cx"> <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr($details['path']) ?>" size="40" style='margin-bottom:5px;' />
</span><del>- <br /><input type='checkbox' style='width:20px;' name='update_home_url' value='update' <?php if( get_blog_option( $id, 'siteurl' ) == preg_replace('|/+$|', '', 'http://' . $details['domain'] . $details['path']) || get_blog_option( $id, 'home' ) == preg_replace('|/+$|', '', 'http://' . $details['domain'] . $details['path']) ) echo 'checked="checked"'; ?> /> <?php _e( "Update 'siteurl' and 'home' as well." ); ?></td>
</del><ins>+ <br /><input type='checkbox' style='width:20px;' name='update_home_url' value='update' <?php if ( get_blog_option( $id, 'siteurl' ) == preg_replace('|/+$|', '', 'http://' . $details['domain'] . $details['path']) || get_blog_option( $id, 'home' ) == preg_replace('|/+$|', '', 'http://' . $details['domain'] . $details['path']) ) echo 'checked="checked"'; ?> /> <?php _e( "Update 'siteurl' and 'home' as well." ); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e('Registered') ?></th>
</span><span class="lines">@@ -108,36 +108,36 @@
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e('Public') ?></th>
</span><span class="cx"> <td>
</span><del>- <input type='radio' style='width:20px;' name='blog[public]' value='1' <?php if( $details['public'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
- <input type='radio' style='width:20px;' name='blog[public]' value='0' <?php if( $details['public'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</del><ins>+ <input type='radio' style='width:20px;' name='blog[public]' value='1' <?php if ( $details['public'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
+ <input type='radio' style='width:20px;' name='blog[public]' value='0' <?php if ( $details['public'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e( 'Archived' ); ?></th>
</span><span class="cx"> <td>
</span><del>- <input type='radio' style='width:20px;' name='blog[archived]' value='1' <?php if( $details['archived'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
- <input type='radio' style='width:20px;' name='blog[archived]' value='0' <?php if( $details['archived'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</del><ins>+ <input type='radio' style='width:20px;' name='blog[archived]' value='1' <?php if ( $details['archived'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
+ <input type='radio' style='width:20px;' name='blog[archived]' value='0' <?php if ( $details['archived'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e( 'Mature' ); ?></th>
</span><span class="cx"> <td>
</span><del>- <input type='radio' style='width:20px;' name='blog[mature]' value='1' <?php if( $details['mature'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
- <input type='radio' style='width:20px;' name='blog[mature]' value='0' <?php if( $details['mature'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</del><ins>+ <input type='radio' style='width:20px;' name='blog[mature]' value='1' <?php if ( $details['mature'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
+ <input type='radio' style='width:20px;' name='blog[mature]' value='0' <?php if ( $details['mature'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e( 'Spam' ); ?></th>
</span><span class="cx"> <td>
</span><del>- <input type='radio' style='width:20px;' name='blog[spam]' value='1' <?php if( $details['spam'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
- <input type='radio' style='width:20px;' name='blog[spam]' value='0' <?php if( $details['spam'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</del><ins>+ <input type='radio' style='width:20px;' name='blog[spam]' value='1' <?php if ( $details['spam'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
+ <input type='radio' style='width:20px;' name='blog[spam]' value='0' <?php if ( $details['spam'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e( 'Deleted' ); ?></th>
</span><span class="cx"> <td>
</span><del>- <input type='radio' style='width:20px;' name='blog[deleted]' value='1' <?php if( $details['deleted'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
- <input type='radio' style='width:20px;' name='blog[deleted]' value='0' <?php if( $details['deleted'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</del><ins>+ <input type='radio' style='width:20px;' name='blog[deleted]' value='1' <?php if ( $details['deleted'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
+ <input type='radio' style='width:20px;' name='blog[deleted]' value='0' <?php if ( $details['deleted'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> $editblog_default_role = 'subscriber';
</span><span class="cx"> foreach ( $options as $key => $val ) {
</span><del>- if( $val['option_name'] == 'default_role' ) {
</del><ins>+ if ( $val['option_name'] == 'default_role' ) {
</ins><span class="cx"> $editblog_default_role = $val['option_value'];
</span><span class="cx"> }
</span><span class="cx"> $disabled = '';
</span><span class="lines">@@ -191,13 +191,13 @@
</span><span class="cx"> $themes = get_themes();
</span><span class="cx"> $blog_allowed_themes = wpmu_get_blog_allowedthemes( $id );
</span><span class="cx"> $allowed_themes = get_site_option( "allowedthemes" );
</span><del>- if( $allowed_themes == false ) {
</del><ins>+ if ( $allowed_themes == false ) {
</ins><span class="cx"> $allowed_themes = array_keys( $themes );
</span><span class="cx"> }
</span><span class="cx"> $out = '';
</span><span class="cx"> foreach( $themes as $key => $theme ) {
</span><span class="cx"> $theme_key = wp_specialchars( $theme['Stylesheet'] );
</span><del>- if( isset($allowed_themes[$theme_key] ) == false ) {
</del><ins>+ if ( isset($allowed_themes[$theme_key] ) == false ) {
</ins><span class="cx"> $checked = ( isset($blog_allowed_themes[ $theme_key ]) ) ? 'checked="checked"' : '';
</span><span class="cx"> $out .= '<tr class="form-field form-required">
</span><span class="cx"> <th title="'.htmlspecialchars( $theme["Description"] ).'" scope="row">'.$key.'</th>
</span><span class="lines">@@ -222,19 +222,19 @@
</span><span class="cx"> <?php
</span><span class="cx"> // Blog users
</span><span class="cx"> $blogusers = get_users_of_blog( $id );
</span><del>- if( is_array( $blogusers ) ) {
</del><ins>+ if ( is_array( $blogusers ) ) {
</ins><span class="cx"> echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __('Blog Users') . '</span></h3><div class="inside">';
</span><span class="cx"> echo '<table class="form-table">';
</span><span class="cx"> echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>";
</span><span class="cx"> reset($blogusers);
</span><span class="cx"> foreach ( (array) $blogusers as $key => $val ) {
</span><span class="cx"> $t = @unserialize( $val->meta_value );
</span><del>- if( is_array( $t ) ) {
</del><ins>+ if ( is_array( $t ) ) {
</ins><span class="cx"> reset( $t );
</span><span class="cx"> $existing_role = key( $t );
</span><span class="cx"> }
</span><span class="cx"> echo '<tr><td><a href="user-edit.php?user_id=' . $val->user_id . '">' . $val->user_login . '</a></td>';
</span><del>- if( $val->user_id != $current_user->data->ID ) {
</del><ins>+ if ( $val->user_id != $current_user->data->ID ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <td>
</span><span class="cx"> <select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php
</span><span class="lines">@@ -316,11 +316,11 @@
</span><span class="cx">
</span><span class="cx"> $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
</span><span class="cx">
</span><del>- if( isset($_GET['blog_name']) ) {
</del><ins>+ if ( isset($_GET['blog_name']) ) {
</ins><span class="cx"> $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
</span><del>- } elseif( isset($_GET['blog_id']) ) {
</del><ins>+ } elseif ( isset($_GET['blog_id']) ) {
</ins><span class="cx"> $query .= " AND blog_id = '". absint( $_GET['blog_id'] )."' ";
</span><del>- } elseif( isset($_GET['blog_ip']) ) {
</del><ins>+ } elseif ( isset($_GET['blog_ip']) ) {
</ins><span class="cx"> $query = "SELECT *
</span><span class="cx"> FROM {$wpdb->blogs}, {$wpdb->registration_log}
</span><span class="cx"> WHERE site_id = '{$wpdb->siteid}'
</span><span class="lines">@@ -328,23 +328,23 @@
</span><span class="cx"> AND {$wpdb->registration_log}.IP LIKE ('%{$like_s}%')";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( isset( $_GET['sortby'] ) == false ) {
</del><ins>+ if ( isset( $_GET['sortby'] ) == false ) {
</ins><span class="cx"> $_GET['sortby'] = 'id';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( $_GET['sortby'] == 'registered' ) {
</del><ins>+ if ( $_GET['sortby'] == 'registered' ) {
</ins><span class="cx"> $query .= ' ORDER BY registered ';
</span><del>- } elseif( $_GET['sortby'] == 'id' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'id' ) {
</ins><span class="cx"> $query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
</span><del>- } elseif( $_GET['sortby'] == 'lastupdated' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'lastupdated' ) {
</ins><span class="cx"> $query .= ' ORDER BY last_updated ';
</span><del>- } elseif( $_GET['sortby'] == 'blogname' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'blogname' ) {
</ins><span class="cx"> $query .= ' ORDER BY domain ';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
</span><span class="cx">
</span><del>- if( !empty($s) ) {
</del><ins>+ if ( !empty($s) ) {
</ins><span class="cx"> $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(blog_id)', $query) );
</span><span class="cx"> } else {
</span><span class="cx"> $total = $wpdb->get_var( "SELECT COUNT(blog_id) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ");
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx">
</span><span class="cx"> // Pagination
</span><span class="cx"> $url2 = "&amp;order=" . $_GET['order'] . "&amp;sortby=" . $_GET['sortby'] . "&amp;s=";
</span><del>- if( $_GET[ 'blog_ip' ] ) {
</del><ins>+ if ( $_GET[ 'blog_ip' ] ) {
</ins><span class="cx"> $url2 .= "&amp;ip_address=" . urlencode( $s );
</span><span class="cx"> } else {
</span><span class="cx"> $url2 .= $s . "&amp;ip_address=" . urlencode( $s );
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> <br class="clear" />
</span><span class="cx">
</span><del>- <?php if( isset($_GET['s']) && !empty($_GET['s']) ) : ?>
</del><ins>+ <?php if ( isset($_GET['s']) && !empty($_GET['s']) ) : ?>
</ins><span class="cx"> <p><a href="ms-users.php?action=users&s=<?php echo urlencode( stripslashes( $s ) ) ?>"><?php _e('Search Users:') ?> <strong><?php echo stripslashes( $s ); ?></strong></a></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -410,13 +410,13 @@
</span><span class="cx"> 'users' => __('Users')
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if( has_filter( 'wpmublogsaction' ) )
</del><ins>+ if ( has_filter( 'wpmublogsaction' ) )
</ins><span class="cx"> $posts_columns['plugins'] = __('Actions');
</span><span class="cx">
</span><span class="cx"> $posts_columns = apply_filters('wpmu_blogs_columns', $posts_columns);
</span><span class="cx">
</span><span class="cx"> $sortby_url = "s=";
</span><del>- if( $_GET[ 'blog_ip' ] ) {
</del><ins>+ if ( $_GET[ 'blog_ip' ] ) {
</ins><span class="cx"> $sortby_url .= "&ip_address=" . urlencode( $s );
</span><span class="cx"> } else {
</span><span class="cx"> $sortby_url .= urlencode( $s ) . "&ip_address=" . urlencode( $s );
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> <th scope="col" class="check-column"></th>
</span><span class="cx"> <?php foreach($posts_columns as $column_id => $column_display_name) {
</span><span class="cx"> $column_link = "<a href='ms-sites.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
</span><del>- if( $_GET['sortby'] == $column_id ) {
</del><ins>+ if ( $_GET['sortby'] == $column_id ) {
</ins><span class="cx"> $column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
</span><span class="cx"> }
</span><span class="cx"> $column_link .= "apage={$apage}'>{$column_display_name}</a>";
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx">
</span><span class="cx"> $bgcolour = "";
</span><span class="cx"> foreach ( $status_list as $status => $col ) {
</span><del>- if( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
</del><ins>+ if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
</ins><span class="cx"> $bgcolour = "style='background: $col'";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -479,17 +479,17 @@
</span><span class="cx"> $controlActions[] = '<a href="ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
</span><span class="cx"> $controlActions[] = "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>';
</span><span class="cx">
</span><del>- if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
</del><ins>+ if ( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
</ins><span class="cx"> $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) . '">' . __('Activate') . '</a>';
</span><span class="cx"> else
</span><span class="cx"> $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';
</span><span class="cx">
</span><del>- if( get_blog_status( $blog['blog_id'], "archived" ) == '1' )
</del><ins>+ if ( get_blog_status( $blog['blog_id'], "archived" ) == '1' )
</ins><span class="cx"> $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';
</span><span class="cx"> else
</span><span class="cx"> $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) . '">' . __('Archive') . '</a>';
</span><span class="cx">
</span><del>- if( get_blog_status( $blog['blog_id'], "spam" ) == '1' )
</del><ins>+ if ( get_blog_status( $blog['blog_id'], "spam" ) == '1' )
</ins><span class="cx"> $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';
</span><span class="cx"> else
</span><span class="cx"> $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> foreach ( $blogusers as $key => $val ) {
</span><span class="cx"> echo '<a href="user-edit.php?user_id=' . $val->user_id . '">' . $val->user_login . '</a> ('.$val->user_email.')<br />';
</span><span class="cx"> }
</span><del>- if( $blogusers_warning != '' ) {
</del><ins>+ if ( $blogusers_warning != '' ) {
</ins><span class="cx"> echo '<strong>' . $blogusers_warning . '</strong><br />';
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'plugins': ?>
</span><del>- <?php if( has_filter( 'wpmublogsaction' ) ) { ?>
</del><ins>+ <?php if ( has_filter( 'wpmublogsaction' ) ) { ?>
</ins><span class="cx"> <td valign="top">
</span><span class="cx"> <?php do_action( "wpmublogsaction", $blog['blog_id'] ); ?>
</span><span class="cx"> </td>
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> <?php break;
</span><span class="cx">
</span><span class="cx"> default: ?>
</span><del>- <?php if( has_filter( 'manage_blogs_custom_column' ) ) { ?>
</del><ins>+ <?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?>
</ins><span class="cx"> <td valign="top">
</span><span class="cx"> <?php do_action('manage_blogs_custom_column', $column_name, $blog['blog_id']); ?>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="trunkwpadminmsupgradesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-site.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-site.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/ms-upgrade-site.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -25,14 +25,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $blogs = $wpdb->get_results( "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
</span><del>- if( is_array( $blogs ) ) {
</del><ins>+ if ( is_array( $blogs ) ) {
</ins><span class="cx"> echo "<ul>";
</span><span class="cx"> foreach( (array) $blogs as $details ) {
</span><del>- if( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
</del><ins>+ if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
</ins><span class="cx"> $siteurl = $wpdb->get_var("SELECT option_value from {$wpdb->base_prefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'");
</span><span class="cx"> echo "<li>$siteurl</li>";
</span><span class="cx"> $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
</span><del>- if( is_wp_error( $response ) ) {
</del><ins>+ if ( is_wp_error( $response ) ) {
</ins><span class="cx"> wp_die( "<strong>Warning!</strong> Problem upgrading {$siteurl}. Your server may not be able to connect to blogs running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
</span><span class="cx"> }
</span><span class="cx"> do_action( 'after_mu_upgrade', $response );
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/ms-users.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -49,30 +49,30 @@
</span><span class="cx">
</span><span class="cx"> $query = "SELECT * FROM {$wpdb->users}";
</span><span class="cx">
</span><del>- if( !empty( $s ) ) {
</del><ins>+ if ( !empty( $s ) ) {
</ins><span class="cx"> $search = '%' . trim( $s ) . '%';
</span><span class="cx"> $query .= " WHERE user_login LIKE '$search' OR user_email LIKE '$search'";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( !isset($_GET['sortby']) ) {
</del><ins>+ if ( !isset($_GET['sortby']) ) {
</ins><span class="cx"> $_GET['sortby'] = 'id';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( $_GET['sortby'] == 'email' ) {
</del><ins>+ if ( $_GET['sortby'] == 'email' ) {
</ins><span class="cx"> $query .= ' ORDER BY user_email ';
</span><del>- } elseif( $_GET['sortby'] == 'id' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'id' ) {
</ins><span class="cx"> $query .= ' ORDER BY ID ';
</span><del>- } elseif( $_GET['sortby'] == 'login' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'login' ) {
</ins><span class="cx"> $query .= ' ORDER BY user_login ';
</span><del>- } elseif( $_GET['sortby'] == 'name' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'name' ) {
</ins><span class="cx"> $query .= ' ORDER BY display_name ';
</span><del>- } elseif( $_GET['sortby'] == 'registered' ) {
</del><ins>+ } elseif ( $_GET['sortby'] == 'registered' ) {
</ins><span class="cx"> $query .= ' ORDER BY user_registered ';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
</span><span class="cx">
</span><del>- if( !empty( $s )) {
</del><ins>+ if ( !empty( $s )) {
</ins><span class="cx"> $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) );
</span><span class="cx"> } else {
</span><span class="cx"> $total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}");
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
</del><ins>+ <?php if ( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
</ins><span class="cx"> <p><a href="ms-sites.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -143,12 +143,12 @@
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="cx"> <?php foreach( (array) $posts_columns as $column_id => $column_display_name) {
</span><del>- if( $column_id == 'blogs' ) {
</del><ins>+ if ( $column_id == 'blogs' ) {
</ins><span class="cx"> echo '<th scope="col">'.__('Blogs').'</th>';
</span><del>- } elseif( $column_id == 'checkbox') {
</del><ins>+ } elseif ( $column_id == 'checkbox') {
</ins><span class="cx"> echo '<th scope="col" class="check-column"><input type="checkbox" /></th>';
</span><span class="cx"> } else { ?>
</span><del>- <th scope="col"><a href="ms-users.php?sortby=<?php echo $column_id ?>&amp;<?php if( $_GET['sortby'] == $column_id ) { if( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th>
</del><ins>+ <th scope="col"><a href="ms-users.php?sortby=<?php echo $column_id ?>&amp;<?php if ( $_GET['sortby'] == $column_id ) { if ( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> $bgcolour = "";
</span><span class="cx"> foreach ( $status_list as $status => $col ) {
</span><del>- if( $user[$status] ) {
</del><ins>+ if ( $user[$status] ) {
</ins><span class="cx"> $bgcolour = "style='background: $col'";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <td>
</span><span class="cx"> <?php
</span><del>- if( is_array( $blogs ) ) {
</del><ins>+ if ( is_array( $blogs ) ) {
</ins><span class="cx"> foreach ( (array) $blogs as $key => $val ) {
</span><span class="cx"> $path = ($val->path == '/') ? '' : $val->path;
</span><span class="cx"> echo '<a href="ms-sites.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> // View
</span><span class="cx"> echo '<a ';
</span><del>- if( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
</del><ins>+ if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
</ins><span class="cx"> echo 'style="background-color: #f66" ';
</span><span class="cx"> echo 'target="_new" href="http://'.$val->domain . $val->path.'">' . __('View') . '</a>';
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-if( apply_filters('show_adduser_fields', true) ) :
</del><ins>+if ( apply_filters('show_adduser_fields', true) ) :
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <h2><?php _e('Add user') ?></h2>
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/options-general.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -294,11 +294,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> if ( is_multisite() && is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) )
</span><span class="cx"> while( ( $lang_file = readdir( $dh ) ) !== false )
</span><del>- if( substr( $lang_file, -3 ) == '.mo' )
</del><ins>+ if ( substr( $lang_file, -3 ) == '.mo' )
</ins><span class="cx"> $lang_files[] = $lang_file;
</span><span class="cx"> $lang = get_option('WPLANG');
</span><span class="cx">
</span><del>-if( is_array($lang_files) && !empty($lang_files) ) {
</del><ins>+if ( is_array($lang_files) && !empty($lang_files) ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th width="33%" scope="row"><?php _e('Blog language:') ?></th>
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/options.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() && is_super_admin() && $_GET[ 'adminhash' ] ) {
</span><span class="cx"> $new_admin_details = get_option( 'adminhash' );
</span><del>- if( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && $new_admin_details[ 'newemail' ] != '' ) {
</del><ins>+ if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && $new_admin_details[ 'newemail' ] != '' ) {
</ins><span class="cx"> update_option( "admin_email", $new_admin_details[ 'newemail' ] );
</span><span class="cx"> delete_option( "adminhash" );
</span><span class="cx"> delete_option( "new_admin_email" );
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> foreach ( (array) $options as $option) :
</span><span class="cx"> $disabled = '';
</span><span class="cx"> $option->option_name = esc_attr($option->option_name);
</span><del>- if( $option->option_name == '' )
</del><ins>+ if ( $option->option_name == '' )
</ins><span class="cx"> continue;
</span><span class="cx"> if ( is_serialized($option->option_value) ) {
</span><span class="cx"> if ( is_serialized_string($option->option_value) ) {
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/plugin-install.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -36,11 +36,11 @@
</span><span class="cx"> $nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
</span><span class="cx">
</span><span class="cx"> //If a non-valid menu tab has been selected, And its not a non-menu action.
</span><del>-if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
</del><ins>+if ( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
</ins><span class="cx"> $tab_actions = array_keys($tabs);
</span><span class="cx"> $tab = $tab_actions[0];
</span><span class="cx"> }
</span><del>-if( empty($paged) )
</del><ins>+if ( empty($paged) )
</ins><span class="cx"> $paged = 1;
</span><span class="cx">
</span><span class="cx"> wp_enqueue_style( 'plugin-install' );
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/plugins.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -165,12 +165,12 @@
</span><span class="cx"> foreach ( (array) $plugins as $plugin ) {
</span><span class="cx"> if ( '.' == dirname($plugin) ) {
</span><span class="cx"> $files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin;
</span><del>- if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
</del><ins>+ if ( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
</ins><span class="cx"> $plugin_info[ $plugin ] = $data;
</span><span class="cx"> } else {
</span><span class="cx"> //Locate all the files in that folder:
</span><span class="cx"> $files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
</span><del>- if( $files ) {
</del><ins>+ if ( $files ) {
</ins><span class="cx"> $files_to_delete = array_merge($files_to_delete, $files);
</span><span class="cx"> }
</span><span class="cx"> //Get plugins list from that folder
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </select>
</span><span class="cx"> <input type="submit" name="doaction_active" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary action" />
</span><del>- <?php if( 'recent' == $context ) : ?>
</del><ins>+ <?php if ( 'recent' == $context ) : ?>
</ins><span class="cx"> <input type="submit" name="clear-recent-list" value="<?php esc_attr_e('Clear List') ?>" class="button-secondary" />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/press-this.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> $content = isset($_POST['content']) ? $_POST['content'] : '';
</span><span class="cx">
</span><span class="cx"> $upload = false;
</span><del>- if( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
</del><ins>+ if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
</ins><span class="cx"> foreach( (array) $_POST['photo_src'] as $key => $image) {
</span><span class="cx"> // see if files exist in content - we don't want to upload non-used selected files.
</span><span class="cx"> if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> $upload = media_sideload_image($image, $post_ID, $desc);
</span><span class="cx">
</span><span class="cx"> // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
</span><del>- if( !is_wp_error($upload) )
</del><ins>+ if ( !is_wp_error($upload) )
</ins><span class="cx"> $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> */
</span><span class="cx"> function get_images_from_uri($uri) {
</span><span class="cx"> $uri = preg_replace('/\/#.+?$/','', $uri);
</span><del>- if( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') )
</del><ins>+ if ( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') )
</ins><span class="cx"> return "'" . esc_attr( html_entity_decode($uri) ) . "'";
</span><span class="cx"> $content = wp_remote_fopen($uri);
</span><span class="cx"> if ( false === $content )
</span><span class="lines">@@ -198,9 +198,9 @@
</span><span class="cx"> $sources = array();
</span><span class="cx"> foreach ($matches[3] as $src) {
</span><span class="cx"> // if no http in url
</span><del>- if(strpos($src, 'http') === false)
</del><ins>+ if (strpos($src, 'http') === false)
</ins><span class="cx"> // if it doesn't have a relative uri
</span><del>- if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
</del><ins>+ if ( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
</ins><span class="cx"> $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
</span><span class="cx"> else
</span><span class="cx"> $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> <li id="video_button">
</span><span class="cx"> <a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="images/media-button-video.gif"/></a>
</span><span class="cx"> </li>
</span><del>- <?php if( user_can_richedit() ) { ?>
</del><ins>+ <?php if ( user_can_richedit() ) { ?>
</ins><span class="cx"> <li id="switcher">
</span><span class="cx"> <?php wp_print_scripts( 'quicktags' ); ?>
</span><span class="cx"> <?php add_filter('the_editor_content', 'wp_richedit_pre'); ?>
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/theme-editor.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> // If we have two files of the same name prefer the one in the Template Directory
</span><span class="cx"> // This means that we display the correct files for child themes which overload Templates as well as Styles
</span><del>- if( array_key_exists($description, $template_mapping ) ) {
</del><ins>+ if ( array_key_exists($description, $template_mapping ) ) {
</ins><span class="cx"> if ( false !== strpos( $template_file, $template_dir ) ) {
</span><span class="cx"> $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/theme-install.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> $nonmenu_tabs = apply_filters('install_themes_nonmenu_tabs', $nonmenu_tabs);
</span><span class="cx">
</span><span class="cx"> //If a non-valid menu tab has been selected, And its not a non-menu action.
</span><del>-if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
</del><ins>+if ( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ) {
</ins><span class="cx"> $tab_actions = array_keys($tabs);
</span><span class="cx"> $tab = $tab_actions[0];
</span><span class="cx"> }
</span><del>-if( empty($paged) )
</del><ins>+if ( empty($paged) )
</ins><span class="cx"> $paged = 1;
</span><span class="cx">
</span><span class="cx"> $body_id = $tab;
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/themes.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -16,21 +16,21 @@
</span><span class="cx"> $themes = get_themes();
</span><span class="cx"> $ct = current_theme_info();
</span><span class="cx"> $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() );
</span><del>- if( $allowed_themes == false )
</del><ins>+ if ( $allowed_themes == false )
</ins><span class="cx"> $allowed_themes = array();
</span><span class="cx">
</span><span class="cx"> $blog_allowed_themes = wpmu_get_blog_allowedthemes();
</span><del>- if( is_array( $blog_allowed_themes ) )
</del><ins>+ if ( is_array( $blog_allowed_themes ) )
</ins><span class="cx"> $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
</span><del>- if( $blog_id != 1 )
</del><ins>+ if ( $blog_id != 1 )
</ins><span class="cx"> unset( $allowed_themes[ "h3" ] );
</span><span class="cx">
</span><del>- if( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
</del><ins>+ if ( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
</ins><span class="cx"> $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
</span><span class="cx">
</span><span class="cx"> reset( $themes );
</span><del>- foreach( $themes as $key => $theme ) {
- if( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false ) {
</del><ins>+ foreach ( $themes as $key => $theme ) {
+ if ( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false ) {
</ins><span class="cx"> unset( $themes[ $key ] );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> wp_enqueue_script( 'theme-preview' );
</span><span class="cx">
</span><span class="cx"> require_once('admin-header.php');
</span><del>-if( is_multisite() && is_super_admin() ) {
</del><ins>+if ( is_multisite() && is_super_admin() ) {
</ins><span class="cx"> ?><div id="message0" class="updated fade"><p><?php _e('Administrator: new themes must be activated in the <a href="wpmu-themes.php">Themes Admin</a> page before they appear here.'); ?></p></div><?php
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/update.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -40,17 +40,17 @@
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
</span><span class="cx">
</span><span class="cx"> check_admin_referer('activate-plugin_' . $plugin);
</span><del>- if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
</del><ins>+ if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
</ins><span class="cx"> wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
</span><span class="cx"> activate_plugin($plugin);
</span><span class="cx"> wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> iframe_header( __('Plugin Reactivation'), true );
</span><del>- if( isset($_GET['success']) )
</del><ins>+ if ( isset($_GET['success']) )
</ins><span class="cx"> echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
</span><span class="cx">
</span><del>- if( isset($_GET['failure']) ){
</del><ins>+ if ( isset($_GET['failure']) ){
</ins><span class="cx"> echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
</span><span class="cx">
</span><span class="cx"> if ( defined('E_RECOVERABLE_ERROR') )
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/upgrade.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
</span><span class="cx"> $backto = esc_url_raw( $backto );
</span><span class="cx"> $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
</span><del>- if( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
</del><ins>+ if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
</ins><span class="cx"> $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
</span><span class="cx"> } else {
</span><span class="cx"> $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/user-edit.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -92,16 +92,16 @@
</span><span class="cx"> // WPMU must delete the user from the current blog if WP added him after editing.
</span><span class="cx"> $delete_role = false;
</span><span class="cx"> $blog_prefix = $wpdb->get_blog_prefix();
</span><del>- if( $user_id != $current_user->ID ) {
</del><ins>+ if ( $user_id != $current_user->ID ) {
</ins><span class="cx"> $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" );
</span><del>- if( null == $cap && $_POST[ 'role' ] == '' ) {
</del><ins>+ if ( null == $cap && $_POST[ 'role' ] == '' ) {
</ins><span class="cx"> $_POST[ 'role' ] = 'contributor';
</span><span class="cx"> $delete_role = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( !isset( $errors ) || ( isset( $errors ) && is_object( $errors ) && false == $errors->get_error_codes() ) )
</span><span class="cx"> $errors = edit_user($user_id);
</span><del>- if( $delete_role ) // stops users being added to current blog when they are edited
</del><ins>+ if ( $delete_role ) // stops users being added to current blog when they are edited
</ins><span class="cx"> update_usermeta( $user_id, $blog_prefix . 'capabilities' , '' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/user-new.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -53,13 +53,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> $user_login = preg_replace( "/\s+/", '', sanitize_user( $_REQUEST[ 'user_login' ], true ) );
</span><span class="cx"> $user_details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE user_login = %s AND user_email = %s", $user_login, $_REQUEST[ 'email' ] ) );
</span><del>- if( $user_details ) {
</del><ins>+ if ( $user_details ) {
</ins><span class="cx"> // Adding an existing user to this blog
</span><span class="cx"> $new_user_email = wp_specialchars(trim($_REQUEST['email']));
</span><span class="cx"> $redirect = 'user-new.php';
</span><span class="cx"> $username = $user_details->user_login;
</span><span class="cx"> $user_id = $user_details->ID;
</span><del>- if( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
</del><ins>+ if ( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
</ins><span class="cx"> $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
</span><span class="cx"> } else {
</span><span class="cx"> if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-admin/users.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if ( ! current_user_can('delete_user', $id) )
</span><span class="cx"> wp_die(__('You can&#8217;t delete that user.'));
</span><span class="cx">
</span><del>- if($id == $current_user->ID) {
</del><ins>+ if ($id == $current_user->ID) {
</ins><span class="cx"> $update = 'err_admin_del';
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-app.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // redirect to /service in case no path is found.
</span><del>- if(strlen($path) == 0 || $path == '/')
</del><ins>+ if (strlen($path) == 0 || $path == '/')
</ins><span class="cx"> $this->redirect($this->get_service_url());
</span><span class="cx">
</span><span class="cx"> // check to see if AtomPub is enabled
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> $this->get_accepted_content_type($this->atom_content_types);
</span><span class="cx">
</span><span class="cx"> $parser = new AtomParser();
</span><del>- if(!$parser->parse()) {
</del><ins>+ if (!$parser->parse()) {
</ins><span class="cx"> $this->bad_request();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx">
</span><span class="cx"> $location = "{$upload_dir['basedir']}/{$location}";
</span><span class="cx">
</span><del>- if(!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
</del><ins>+ if (!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
</ins><span class="cx"> $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
</span><span class="cx">
</span><span class="cx"> $fp = fopen("php://input", "rb");
</span><span class="lines">@@ -899,7 +899,7 @@
</span><span class="cx"> */
</span><span class="cx"> function get_attachments_url($page = null) {
</span><span class="cx"> $url = $this->app_base . $this->MEDIA_PATH;
</span><del>- if(isset($page) && is_int($page)) {
</del><ins>+ if (isset($page) && is_int($page)) {
</ins><span class="cx"> $url .= "/$page";
</span><span class="cx"> }
</span><span class="cx"> return $url;
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_entry_url($postID = null) {
</span><del>- if(!isset($postID)) {
</del><ins>+ if (!isset($postID)) {
</ins><span class="cx"> global $post;
</span><span class="cx"> $postID = (int) $post->ID;
</span><span class="cx"> }
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_media_url($postID = null) {
</span><del>- if(!isset($postID)) {
</del><ins>+ if (!isset($postID)) {
</ins><span class="cx"> global $post;
</span><span class="cx"> $postID = (int) $post->ID;
</span><span class="cx"> }
</span><span class="lines">@@ -1000,14 +1000,14 @@
</span><span class="cx"> global $entry;
</span><span class="cx"> log_app('function',"set_current_entry($postID)");
</span><span class="cx">
</span><del>- if(!isset($postID)) {
</del><ins>+ if (!isset($postID)) {
</ins><span class="cx"> // $this->bad_request();
</span><span class="cx"> $this->not_found();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $entry = wp_get_single_post($postID,ARRAY_A);
</span><span class="cx">
</span><del>- if(!isset($entry) || !isset($entry['ID']))
</del><ins>+ if (!isset($entry) || !isset($entry['ID']))
</ins><span class="cx"> $this->not_found();
</span><span class="cx">
</span><span class="cx"> return;
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx">
</span><span class="cx"> $this->ENTRY_PATH = $post_type;
</span><span class="cx">
</span><del>- if(!isset($page)) {
</del><ins>+ if (!isset($page)) {
</ins><span class="cx"> $page = 1;
</span><span class="cx"> }
</span><span class="cx"> $page = (int) $page;
</span><span class="lines">@@ -1087,10 +1087,10 @@
</span><span class="cx"> <title type="text"><?php bloginfo_rss('name') ?></title>
</span><span class="cx"> <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
</span><span class="cx"> <link rel="first" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url() ?>" />
</span><del>-<?php if(isset($prev_page)): ?>
</del><ins>+<?php if (isset($prev_page)): ?>
</ins><span class="cx"> <link rel="previous" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($prev_page) ?>" />
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php if(isset($next_page)): ?>
</del><ins>+<?php if (isset($next_page)): ?>
</ins><span class="cx"> <link rel="next" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($next_page) ?>" />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <link rel="last" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($last_page) ?>" />
</span><span class="lines">@@ -1171,7 +1171,7 @@
</span><span class="cx"> <uri><?php the_author_meta('url') ?></uri>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </author>
</span><del>-<?php if($GLOBALS['post']->post_type == 'attachment') { ?>
</del><ins>+<?php if ($GLOBALS['post']->post_type == 'attachment') { ?>
</ins><span class="cx"> <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
</span><span class="cx"> <content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -1364,7 +1364,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> header("Content-Type: $this->ATOM_CONTENT_TYPE");
</span><del>- if(isset($ctloc))
</del><ins>+ if (isset($ctloc))
</ins><span class="cx"> header('Content-Location: ' . $ctloc);
</span><span class="cx"> header('Location: ' . $edit);
</span><span class="cx"> status_header('201');
</span><span class="lines">@@ -1419,7 +1419,7 @@
</span><span class="cx"> header('Content-Type: ' . $ctype);
</span><span class="cx"> header('Content-Disposition: attachment; filename=atom.xml');
</span><span class="cx"> header('Date: '. date('r'));
</span><del>- if($this->do_output)
</del><ins>+ if ($this->do_output)
</ins><span class="cx"> echo $xml;
</span><span class="cx"> log_app('function', "output:\n$xml");
</span><span class="cx"> exit;
</span><span class="lines">@@ -1458,7 +1458,7 @@
</span><span class="cx">
</span><span class="cx"> // if using mod_rewrite/ENV hack
</span><span class="cx"> // http://www.besthostratings.com/articles/http-auth-php-cgi.html
</span><del>- if(isset($_SERVER['HTTP_AUTHORIZATION'])) {
</del><ins>+ if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
</ins><span class="cx"> list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
</span><span class="cx"> explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
</span><span class="cx"> } else if (isset($_SERVER['REDIRECT_REMOTE_USER'])) {
</span><span class="lines">@@ -1469,7 +1469,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If Basic Auth is working...
</span><del>- if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
</del><ins>+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
</ins><span class="cx"> log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);
</span><span class="cx">
</span><span class="cx"> $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
</span><span class="lines">@@ -1493,11 +1493,11 @@
</span><span class="cx"> */
</span><span class="cx"> function get_accepted_content_type($types = null) {
</span><span class="cx">
</span><del>- if(!isset($types)) {
</del><ins>+ if (!isset($types)) {
</ins><span class="cx"> $types = $this->media_content_types;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(!isset($_SERVER['CONTENT_LENGTH']) || !isset($_SERVER['CONTENT_TYPE'])) {
</del><ins>+ if (!isset($_SERVER['CONTENT_LENGTH']) || !isset($_SERVER['CONTENT_TYPE'])) {
</ins><span class="cx"> $this->length_required();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1508,8 +1508,8 @@
</span><span class="cx">
</span><span class="cx"> foreach($types as $t) {
</span><span class="cx"> list($acceptedType,$acceptedSubtype) = explode('/',$t);
</span><del>- if($acceptedType == '*' || $acceptedType == $type) {
- if($acceptedSubtype == '*' || $acceptedSubtype == $subtype)
</del><ins>+ if ($acceptedType == '*' || $acceptedType == $type) {
+ if ($acceptedSubtype == '*' || $acceptedSubtype == $subtype)
</ins><span class="cx"> return $type . "/" . $subtype;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1524,8 +1524,8 @@
</span><span class="cx"> */
</span><span class="cx"> function process_conditionals() {
</span><span class="cx">
</span><del>- if(empty($this->params)) return;
- if($_SERVER['REQUEST_METHOD'] == 'DELETE') return;
</del><ins>+ if (empty($this->params)) return;
+ if ($_SERVER['REQUEST_METHOD'] == 'DELETE') return;
</ins><span class="cx">
</span><span class="cx"> switch($this->params[0]) {
</span><span class="cx"> case $this->ENTRY_PATH:
</span><span class="lines">@@ -1576,10 +1576,10 @@
</span><span class="cx"> function rfc3339_str2time($str) {
</span><span class="cx">
</span><span class="cx"> $match = false;
</span><del>- if(!preg_match("/(\d{4}-\d{2}-\d{2})T(\d{2}\:\d{2}\:\d{2})\.?\d{0,3}(Z|[+-]+\d{2}\:\d{2})/", $str, $match))
</del><ins>+ if (!preg_match("/(\d{4}-\d{2}-\d{2})T(\d{2}\:\d{2}\:\d{2})\.?\d{0,3}(Z|[+-]+\d{2}\:\d{2})/", $str, $match))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if($match[3] == 'Z')
</del><ins>+ if ($match[3] == 'Z')
</ins><span class="cx"> $match[3] == '+0000';
</span><span class="cx">
</span><span class="cx"> return strtotime($match[1] . " " . $match[2] . " " . $match[3]);
</span><span class="lines">@@ -1597,7 +1597,7 @@
</span><span class="cx">
</span><span class="cx"> $pubtime = $this->rfc3339_str2time($published);
</span><span class="cx">
</span><del>- if(!$pubtime) {
</del><ins>+ if (!$pubtime) {
</ins><span class="cx"> return array(current_time('mysql'),current_time('mysql',1));
</span><span class="cx"> } else {
</span><span class="cx"> return array(date("Y-m-d H:i:s", $pubtime), gmdate("Y-m-d H:i:s", $pubtime));
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/wp-signup.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> switch ($_POST['stage']) {
</span><span class="cx"> case 'validate-user-signup' :
</span><del>- if( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
</del><ins>+ if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
</ins><span class="cx"> validate_user_signup();
</span><span class="cx"> else
</span><span class="cx"> _e( "User registration has been disabled." );
</span><span class="lines">@@ -409,9 +409,9 @@
</span><span class="cx"> do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere?
</span><span class="cx"> if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
</span><span class="cx"> signup_another_blog($newblogname);
</span><del>- elseif( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
</del><ins>+ elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
</ins><span class="cx"> signup_user( $newblogname, $user_email );
</span><del>- elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
</del><ins>+ elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
</ins><span class="cx"> _e( "I'm sorry. We're not accepting new registrations at this time." );
</span><span class="cx"> else
</span><span class="cx"> _e( "You're logged in already. No need to register again!" );
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (12751 => 12752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-01-18 11:44:51 UTC (rev 12751)
+++ trunk/xmlrpc.php 2010-01-18 20:34:48 UTC (rev 12752)
</span><span class="lines">@@ -2241,7 +2241,7 @@
</span><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><del>- } elseif( $content_struct['post_type'] == 'post' ) {
</del><ins>+ } elseif ( $content_struct['post_type'] == 'post' ) {
</ins><span class="cx"> // This is the default, no changes needed
</span><span class="cx"> } else {
</span><span class="cx"> // No other post_type values are allowed here
</span><span class="lines">@@ -2827,7 +2827,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ($posts_list as $entry) {
</span><del>- if( !current_user_can( 'edit_post', $entry['ID'] ) )
</del><ins>+ if ( !current_user_can( 'edit_post', $entry['ID'] ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date'], false);
</span></span></pre>
</div>
</div>
</body>
</html>