Index: src/wp-admin/includes/plugin.php
===================================================================
--- src/wp-admin/includes/plugin.php (revision 29204)
+++ src/wp-admin/includes/plugin.php (working copy)
@@ -851,7 +851,7 @@
*/
function validate_active_plugins() {
$plugins = get_option( 'active_plugins', array() );
- // validate vartype: array
+ // Validate vartype: array.
if ( ! is_array( $plugins ) ) {
update_option( 'active_plugins', array() );
$plugins = array();
@@ -867,7 +867,7 @@
$invalid = array();
- // invalid plugins get deactivated
+ // Invalid plugins get deactivated.
foreach ( $plugins as $plugin ) {
$result = validate_plugin( $plugin );
if ( is_wp_error( $result ) ) {
@@ -1119,10 +1119,12 @@
return false;
}
- // If the parent doesn't already have a submenu, add a link to the parent
- // as the first item in the submenu. If the submenu file is the same as the
- // parent file someone is trying to link back to the parent manually. In
- // this case, don't automatically add a link back to avoid duplication.
+ /*
+ * If the parent doesn't already have a submenu, add a link to the parent
+ * as the first item in the submenu. If the submenu file is the same as the
+ * parent file someone is trying to link back to the parent manually. In
+ * this case, don't automatically add a link back to avoid duplication.
+ */
if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
foreach ( (array)$menu as $parent_menu ) {
if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
@@ -1137,11 +1139,15 @@
add_action( $hookname, $function );
$_registered_pages[$hookname] = true;
- // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
+
+ /*
+ * Backward-compatibility for plugins using add_management page.
+ * See wp-admin/admin.php for redirect from edit.php to tools.php
+ */
if ( 'tools.php' == $parent_slug )
$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
- // No parent as top level
+ // No parent as top level.
$_parent_pages[$menu_slug] = $parent_slug;
return $hookname;
Index: src/wp-admin/includes/post.php
===================================================================
--- src/wp-admin/includes/post.php (revision 29204)
+++ src/wp-admin/includes/post.php (working copy)
@@ -302,7 +302,7 @@
$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
$image_alt = wp_strip_all_tags( $image_alt, true );
- // update_meta expects slashed
+ // update_meta expects slashed.
update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
}
}
@@ -740,9 +740,10 @@
$metavalue = trim( $metavalue );
if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
- // We have a key/value pair. If both the select and the
- // input for the key have data, the input takes precedence:
-
+ /*
+ * We have a key/value pair. If both the select and the input
+ * for the key have data, the input takes precedence.
+ */
if ( '#NONE#' != $metakeyselect )
$metakey = $metakeyselect;
Index: src/wp-admin/includes/revision.php
===================================================================
--- src/wp-admin/includes/revision.php (revision 29204)
+++ src/wp-admin/includes/revision.php (working copy)
@@ -177,8 +177,11 @@
);
}
- // If a post has been saved since the last revision (no revisioned fields were changed)
- // we may not have a "current" revision. Mark the latest revision as "current".
+ /*
+ * If a post has been saved since the last revision (no revisioned fields
+ * were changed), we may not have a "current" revision. Mark the latest
+ * revision as "current".
+ */
if ( empty( $current_id ) ) {
if ( $revisions[ $revision->ID ]['autosave'] ) {
$revision = end( $revisions );
@@ -192,7 +195,7 @@
$revisions[ $current_id ]['current'] = true;
}
- // Now, grab the initial diff
+ // Now, grab the initial diff.
$compare_two_mode = is_numeric( $from );
if ( ! $compare_two_mode ) {
$found = array_search( $selected_revision_id, array_keys( $revisions ) );
Index: src/wp-admin/includes/schema.php
===================================================================
--- src/wp-admin/includes/schema.php (revision 29204)
+++ src/wp-admin/includes/schema.php (working copy)
@@ -205,7 +205,7 @@
KEY user_nicename (user_nicename)
) $charset_collate;\n";
- // usermeta
+ // Usermeta.
$usermeta_table = "CREATE TABLE $wpdb->usermeta (
umeta_id bigint(20) unsigned NOT NULL auto_increment,
user_id bigint(20) unsigned NOT NULL default '0',
@@ -522,10 +522,10 @@
if ( !empty($insert) )
$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
- // in case it is set, but blank, update "home"
+ // In case it is set, but blank, update "home".
if ( !__get_option('home') ) update_option('home', $guessurl);
- // Delete unused options
+ // Delete unused options.
$unusedoptions = array(
'blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory',
'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping',
@@ -547,12 +547,14 @@
foreach ( $unusedoptions as $option )
delete_option($option);
- // delete obsolete magpie stuff
+ // Delete obsolete magpie stuff.
$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
- // Deletes all expired transients.
- // The multi-table delete syntax is used to delete the transient record from table a,
- // and the corresponding transient_timeout record from table b.
+ /*
+ * Deletes all expired transients. The multi-table delete syntax is used
+ * to delete the transient record from table a, and the corresponding
+ * transient_timeout record from table b.
+ */
$time = time();
$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
WHERE a.option_name LIKE %s
@@ -819,8 +821,10 @@
$role->add_cap( 'list_users' );
$role->add_cap( 'remove_users' );
- // Never used, will be removed. create_users or
- // promote_users is the capability you're looking for.
+ /*
+ * Never used, will be removed. create_users or promote_users
+ * is the capability you're looking for.
+ */
$role->add_cap( 'add_users' );
$role->add_cap( 'promote_users' );
@@ -863,7 +867,7 @@
if ( '' == $site_name )
$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
- // check for network collision
+ // Check for network collision.
if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
@@ -874,7 +878,7 @@
if ( $errors->get_error_code() )
return $errors;
- // set up site tables
+ // Set up site tables.
$template = get_option( 'template' );
$stylesheet = get_option( 'stylesheet' );
$allowed_themes = array( $stylesheet => true );
@@ -920,13 +924,13 @@
--The Team @ SITE_NAME' );
$misc_exts = array(
- // images
+ // Images.
'jpg', 'jpeg', 'png', 'gif',
- // video
+ // Video.
'mov', 'avi', 'mpg', '3gp', '3g2',
- // "audio"
+ // "audio".
'midi', 'mid',
- // misc
+ // Miscellaneous.
'pdf', 'doc', 'ppt', 'odt', 'pptx', 'docx', 'pps', 'ppsx', 'xls', 'xlsx', 'key',
);
$audio_exts = wp_get_audio_extensions();
@@ -981,9 +985,13 @@
}
$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
- // When upgrading from single to multisite, assume the current site will become the main site of the network.
- // When using populate_network() to create another network in an existing multisite environment,
- // skip these steps since the main site of the new network has not yet been created.
+ /*
+ * When upgrading from single to multisite, assume the current site will
+ * become the main site of the network. When using populate_network()
+ * to create another network in an existing multisite environment, skip
+ * these steps since the main site of the new network has not yet been
+ * created.
+ */
if ( ! is_multisite() ) {
$current_site = new stdClass;
$current_site->domain = $domain;
Index: src/wp-admin/includes/template.php
===================================================================
--- src/wp-admin/includes/template.php (revision 29204)
+++ src/wp-admin/includes/template.php (working copy)
@@ -583,10 +583,10 @@
if ( is_serialized( $entry['meta_value'] ) ) {
if ( is_serialized_string( $entry['meta_value'] ) ) {
- // this is a serialized string, so we should display it
+ // This is a serialized string, so we should display it.
$entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
} else {
- // this is a serialized array/object so we should NOT display it
+ // This is a serialized array/object so we should NOT display it.
--$count;
return;
}
@@ -716,6 +716,7 @@
if ( (int) $tab_index > 0 )
$tab_index_attribute = " tabindex=\"$tab_index\"";
+ // todo: Remove this?
// echo '
'; $time_adj = current_time('timestamp'); @@ -940,23 +941,30 @@ // If core box previously deleted, don't add if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) return; - // If box was added with default priority, give it core priority to maintain sort order + + /* + * If box was added with default priority, give it core priority to + * maintain sort order. + */ if ( 'default' == $a_priority ) { $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id]; unset($wp_meta_boxes[$page][$a_context]['default'][$id]); } return; } - // If no priority given and id already present, use existing priority + // If no priority given and id already present, use existing priority. if ( empty($priority) ) { $priority = $a_priority; - // else if we're adding to the sorted priority, we don't know the title or callback. Grab them from the previously added context/priority. + /* + * Else, if we're adding to the sorted priority, we don't know the title + * or callback. Grab them from the previously added context/priority. + */ } elseif ( 'sorted' == $priority ) { $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title']; $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback']; $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args']; } - // An id can be in only one priority and one context + // An id can be in only one priority and one context. if ( $priority != $a_priority || $context != $a_context ) unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]); } @@ -1340,23 +1348,25 @@ function get_settings_errors( $setting = '', $sanitize = false ) { global $wp_settings_errors; - // If $sanitize is true, manually re-run the sanitization for this option - // This allows the $sanitize_callback from register_setting() to run, adding - // any settings errors you want to show by default. + /* + * If $sanitize is true, manually re-run the sanitization for this option + * This allows the $sanitize_callback from register_setting() to run, adding + * any settings errors you want to show by default. + */ if ( $sanitize ) sanitize_option( $setting, get_option( $setting ) ); - // If settings were passed back from options.php then use them + // If settings were passed back from options.php then use them. if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) { $wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) ); delete_transient( 'settings_errors' ); } - // Check global in case errors have been added on this pageload + // Check global in case errors have been added on this pageload. if ( ! count( $wp_settings_errors ) ) return array(); - // Filter the results to those of a specific setting if one was set + // Filter the results to those of a specific setting if one was set. if ( $setting ) { $setting_errors = array(); foreach ( (array) $wp_settings_errors as $key => $details ) { Index: src/wp-admin/includes/update-core.php =================================================================== --- src/wp-admin/includes/update-core.php (revision 29204) +++ src/wp-admin/includes/update-core.php (working copy) @@ -1089,7 +1089,10 @@ return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename ); } - // generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list + /* + * Generate the $sub_skip_list for the subdirectory as a sub-set + * of the existing $skip_list. + */ $sub_skip_list = array(); foreach ( $skip_list as $skip_item ) { if ( 0 === strpos( $skip_item, $filename . '/' ) ) @@ -1125,7 +1128,7 @@ if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) return; - // Load the updated default text localization domain for new strings + // Load the updated default text localization domain for new strings. load_default_textdomain(); // See do_core_upgrade() @@ -1141,7 +1144,7 @@ query("ALTER TABLE $wpdb->users DROP $old"); $wpdb->show_errors(); - // populate comment_count field of posts table + // Populate comment_count field of posts table. $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" ); if ( is_array( $comments ) ) foreach ($comments as $comment) $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) ); - // Some alpha versions used a post status of object instead of attachment and put - // the mime type in post_type instead of post_mime_type. + /* + * Some alpha versions used a post status of object instead of attachment + * and put the mime type in post_type instead of post_mime_type. + */ if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) { $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'"); foreach ($objects as $object) { @@ -880,8 +886,10 @@ // < 3570 we used linkcategories. >= 3570 we used categories and link2cat. if ( $wp_current_db_version < 3570 ) { - // Create link_category terms for link categories. Create a map of link cat IDs - // to link_category terms. + /* + * Create link_category terms for link categories. Create a map of link + * cat IDs to link_category terms. + */ $link_cat_id_map = array(); $default_link_cat = 0; $tt_ids = array(); @@ -989,7 +997,7 @@ * @since 2.2.0 */ function upgrade_old_slugs() { - // upgrade people who were using the Redirect Old Slugs plugin + // Upgrade people who were using the Redirect Old Slugs plugin. global $wpdb; $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'"); } @@ -1304,11 +1312,13 @@ function upgrade_network() { global $wp_current_db_version, $wpdb; - // Always + // Always. if ( is_main_network() ) { - // Deletes all expired transients. - // The multi-table delete syntax is used to delete the transient record from table a, - // and the corresponding transient_timeout record from table b. + /* + * Deletes all expired transients. The multi-table delete syntax is used + * to delete the transient record from table a, and the corresponding + * transient_timeout record from table b. + */ $time = time(); $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b WHERE a.meta_key LIKE %s @@ -1318,7 +1328,7 @@ $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) ); } - // 2.8 + // 2.8. if ( $wp_current_db_version < 11549 ) { $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' ); $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' ); @@ -1415,9 +1425,11 @@ if ( $wpdb->get_var( $query ) == $table_name ) { return true; } - //didn't find it try to create it. + + // Didn't find it try to create it.. $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! if ( $wpdb->get_var( $query ) == $table_name ) { return true; } @@ -1478,9 +1490,11 @@ return true; } } - //didn't find it try to create it. + + // Didn't find it try to create it. $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) { if ($column == $column_name) { return true; @@ -1551,12 +1565,16 @@ function deslash($content) { // Note: \\\ inside a regex denotes a single backslash. - // Replace one or more backslashes followed by a single quote with - // a single quote. + /* + * Replace one or more backslashes followed by a single quote with + * a single quote. + */ $content = preg_replace("/\\\+'/", "'", $content); - // Replace one or more backslashes followed by a double quote with - // a double quote. + /* + * Replace one or more backslashes followed by a double quote with + * a double quote. + */ $content = preg_replace('/\\\+"/', '"', $content); // Replace one or more backslashes with one backslash. @@ -1655,24 +1673,27 @@ if ( ! $tablefields ) continue; - // Clear the field and index arrays + // Clear the field and index arrays. $cfields = $indices = array(); - // Get all of the field names in the query from between the parens + + // Get all of the field names in the query from between the parentheses. preg_match("|\((.*)\)|ms", $qry, $match2); $qryline = trim($match2[1]); - // Separate field lines into an array + // Separate field lines into an array. $flds = explode("\n", $qryline); + // todo: Remove this? //echo "
"; - // For every field line specified in the query + // For every field line specified in the query. foreach ($flds as $fld) { - // Extract the field name + + // Extract the field name. preg_match("|^([^ ]*)|", trim($fld), $fvals); $fieldname = trim( $fvals[1], '`' ); - // Verify the found field name + // Verify the found field name. $validfield = true; switch (strtolower($fieldname)) { case '': @@ -1687,17 +1708,19 @@ } $fld = trim($fld); - // If it's a valid field, add it to the field array + // If it's a valid field, add it to the field array. if ($validfield) { $cfields[strtolower($fieldname)] = trim($fld, ", \n"); } } - // For every field in the table + // For every field in the table. foreach ($tablefields as $tablefield) { - // If the table field exists in the field array... + + // If the table field exists in the field array ... if (array_key_exists(strtolower($tablefield->Field), $cfields)) { - // Get the field type from the query + + // Get the field type from the query. preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches); $fieldtype = $matches[1]; @@ -1709,6 +1732,7 @@ } // Get the default value from the array + // todo: Remove this? //echo "{$cfields[strtolower($tablefield->Field)]}
"; if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) { $default_value = $matches[1]; @@ -1719,39 +1743,40 @@ } } - // Remove the field from the array (so it's not added) + // Remove the field from the array (so it's not added). unset($cfields[strtolower($tablefield->Field)]); } else { // This field exists in the table, but not in the creation queries? } } - // For every remaining field specified for the table + // For every remaining field specified for the table. foreach ($cfields as $fieldname => $fielddef) { - // Push a query line into $cqueries that adds the field to that table + // Push a query line into $cqueries that adds the field to that table. $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef"; $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname; } - // Index stuff goes here - // Fetch the table index structure from the database + // Index stuff goes here. Fetch the table index structure from the database. $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};"); if ($tableindices) { - // Clear the index array + // Clear the index array. unset($index_ary); - // For every index in the table + // For every index in the table. foreach ($tableindices as $tableindex) { - // Add the index to the index data array + + // Add the index to the index data array. $keyname = $tableindex->Key_name; $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part); $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false; } - // For each actual index in the index array + // For each actual index in the index array. foreach ($index_ary as $index_name => $index_data) { - // Build a create string to compare to the query + + // Build a create string to compare to the query. $index_string = ''; if ($index_name == 'PRIMARY') { $index_string .= 'PRIMARY '; @@ -1763,39 +1788,44 @@ $index_string .= $index_name; } $index_columns = ''; - // For each column in the index + + // For each column in the index. foreach ($index_data['columns'] as $column_data) { if ($index_columns != '') $index_columns .= ','; - // Add the field to the column list string + + // Add the field to the column list string. $index_columns .= $column_data['fieldname']; if ($column_data['subpart'] != '') { $index_columns .= '('.$column_data['subpart'].')'; } } - // Add the column list to the index create string + // Add the column list to the index create string. $index_string .= ' ('.$index_columns.')'; if (!(($aindex = array_search($index_string, $indices)) === false)) { unset($indices[$aindex]); + // todo: Remove this? //echo "
'; $time_adj = current_time('timestamp'); @@ -940,23 +941,30 @@ // If core box previously deleted, don't add if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) return; - // If box was added with default priority, give it core priority to maintain sort order + + /* + * If box was added with default priority, give it core priority to + * maintain sort order. + */ if ( 'default' == $a_priority ) { $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id]; unset($wp_meta_boxes[$page][$a_context]['default'][$id]); } return; } - // If no priority given and id already present, use existing priority + // If no priority given and id already present, use existing priority. if ( empty($priority) ) { $priority = $a_priority; - // else if we're adding to the sorted priority, we don't know the title or callback. Grab them from the previously added context/priority. + /* + * Else, if we're adding to the sorted priority, we don't know the title + * or callback. Grab them from the previously added context/priority. + */ } elseif ( 'sorted' == $priority ) { $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title']; $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback']; $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args']; } - // An id can be in only one priority and one context + // An id can be in only one priority and one context. if ( $priority != $a_priority || $context != $a_context ) unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]); } @@ -1340,23 +1348,25 @@ function get_settings_errors( $setting = '', $sanitize = false ) { global $wp_settings_errors; - // If $sanitize is true, manually re-run the sanitization for this option - // This allows the $sanitize_callback from register_setting() to run, adding - // any settings errors you want to show by default. + /* + * If $sanitize is true, manually re-run the sanitization for this option + * This allows the $sanitize_callback from register_setting() to run, adding + * any settings errors you want to show by default. + */ if ( $sanitize ) sanitize_option( $setting, get_option( $setting ) ); - // If settings were passed back from options.php then use them + // If settings were passed back from options.php then use them. if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) { $wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) ); delete_transient( 'settings_errors' ); } - // Check global in case errors have been added on this pageload + // Check global in case errors have been added on this pageload. if ( ! count( $wp_settings_errors ) ) return array(); - // Filter the results to those of a specific setting if one was set + // Filter the results to those of a specific setting if one was set. if ( $setting ) { $setting_errors = array(); foreach ( (array) $wp_settings_errors as $key => $details ) { Index: src/wp-admin/includes/update-core.php =================================================================== --- src/wp-admin/includes/update-core.php (revision 29204) +++ src/wp-admin/includes/update-core.php (working copy) @@ -1089,7 +1089,10 @@ return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename ); } - // generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list + /* + * Generate the $sub_skip_list for the subdirectory as a sub-set + * of the existing $skip_list. + */ $sub_skip_list = array(); foreach ( $skip_list as $skip_item ) { if ( 0 === strpos( $skip_item, $filename . '/' ) ) @@ -1125,7 +1128,7 @@ if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) return; - // Load the updated default text localization domain for new strings + // Load the updated default text localization domain for new strings. load_default_textdomain(); // See do_core_upgrade() @@ -1141,7 +1144,7 @@ query("ALTER TABLE $wpdb->users DROP $old"); $wpdb->show_errors(); - // populate comment_count field of posts table + // Populate comment_count field of posts table. $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" ); if ( is_array( $comments ) ) foreach ($comments as $comment) $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) ); - // Some alpha versions used a post status of object instead of attachment and put - // the mime type in post_type instead of post_mime_type. + /* + * Some alpha versions used a post status of object instead of attachment + * and put the mime type in post_type instead of post_mime_type. + */ if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) { $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'"); foreach ($objects as $object) { @@ -880,8 +886,10 @@ // < 3570 we used linkcategories. >= 3570 we used categories and link2cat. if ( $wp_current_db_version < 3570 ) { - // Create link_category terms for link categories. Create a map of link cat IDs - // to link_category terms. + /* + * Create link_category terms for link categories. Create a map of link + * cat IDs to link_category terms. + */ $link_cat_id_map = array(); $default_link_cat = 0; $tt_ids = array(); @@ -989,7 +997,7 @@ * @since 2.2.0 */ function upgrade_old_slugs() { - // upgrade people who were using the Redirect Old Slugs plugin + // Upgrade people who were using the Redirect Old Slugs plugin. global $wpdb; $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'"); } @@ -1304,11 +1312,13 @@ function upgrade_network() { global $wp_current_db_version, $wpdb; - // Always + // Always. if ( is_main_network() ) { - // Deletes all expired transients. - // The multi-table delete syntax is used to delete the transient record from table a, - // and the corresponding transient_timeout record from table b. + /* + * Deletes all expired transients. The multi-table delete syntax is used + * to delete the transient record from table a, and the corresponding + * transient_timeout record from table b. + */ $time = time(); $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b WHERE a.meta_key LIKE %s @@ -1318,7 +1328,7 @@ $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) ); } - // 2.8 + // 2.8. if ( $wp_current_db_version < 11549 ) { $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' ); $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' ); @@ -1415,9 +1425,11 @@ if ( $wpdb->get_var( $query ) == $table_name ) { return true; } - //didn't find it try to create it. + + // Didn't find it try to create it.. $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! if ( $wpdb->get_var( $query ) == $table_name ) { return true; } @@ -1478,9 +1490,11 @@ return true; } } - //didn't find it try to create it. + + // Didn't find it try to create it. $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! + + // We cannot directly tell that whether this succeeded! foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) { if ($column == $column_name) { return true; @@ -1551,12 +1565,16 @@ function deslash($content) { // Note: \\\ inside a regex denotes a single backslash. - // Replace one or more backslashes followed by a single quote with - // a single quote. + /* + * Replace one or more backslashes followed by a single quote with + * a single quote. + */ $content = preg_replace("/\\\+'/", "'", $content); - // Replace one or more backslashes followed by a double quote with - // a double quote. + /* + * Replace one or more backslashes followed by a double quote with + * a double quote. + */ $content = preg_replace('/\\\+"/', '"', $content); // Replace one or more backslashes with one backslash. @@ -1655,24 +1673,27 @@ if ( ! $tablefields ) continue; - // Clear the field and index arrays + // Clear the field and index arrays. $cfields = $indices = array(); - // Get all of the field names in the query from between the parens + + // Get all of the field names in the query from between the parentheses. preg_match("|\((.*)\)|ms", $qry, $match2); $qryline = trim($match2[1]); - // Separate field lines into an array + // Separate field lines into an array. $flds = explode("\n", $qryline); + // todo: Remove this? //echo "
\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."
"; - // For every field line specified in the query + // For every field line specified in the query. foreach ($flds as $fld) { - // Extract the field name + + // Extract the field name. preg_match("|^([^ ]*)|", trim($fld), $fvals); $fieldname = trim( $fvals[1], '`' ); - // Verify the found field name + // Verify the found field name. $validfield = true; switch (strtolower($fieldname)) { case '': @@ -1687,17 +1708,19 @@ } $fld = trim($fld); - // If it's a valid field, add it to the field array + // If it's a valid field, add it to the field array. if ($validfield) { $cfields[strtolower($fieldname)] = trim($fld, ", \n"); } } - // For every field in the table + // For every field in the table. foreach ($tablefields as $tablefield) { - // If the table field exists in the field array... + + // If the table field exists in the field array ... if (array_key_exists(strtolower($tablefield->Field), $cfields)) { - // Get the field type from the query + + // Get the field type from the query. preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches); $fieldtype = $matches[1]; @@ -1709,6 +1732,7 @@ } // Get the default value from the array + // todo: Remove this? //echo "{$cfields[strtolower($tablefield->Field)]}
"; if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) { $default_value = $matches[1]; @@ -1719,39 +1743,40 @@ } } - // Remove the field from the array (so it's not added) + // Remove the field from the array (so it's not added). unset($cfields[strtolower($tablefield->Field)]); } else { // This field exists in the table, but not in the creation queries? } } - // For every remaining field specified for the table + // For every remaining field specified for the table. foreach ($cfields as $fieldname => $fielddef) { - // Push a query line into $cqueries that adds the field to that table + // Push a query line into $cqueries that adds the field to that table. $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef"; $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname; } - // Index stuff goes here - // Fetch the table index structure from the database + // Index stuff goes here. Fetch the table index structure from the database. $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};"); if ($tableindices) { - // Clear the index array + // Clear the index array. unset($index_ary); - // For every index in the table + // For every index in the table. foreach ($tableindices as $tableindex) { - // Add the index to the index data array + + // Add the index to the index data array. $keyname = $tableindex->Key_name; $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part); $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false; } - // For each actual index in the index array + // For each actual index in the index array. foreach ($index_ary as $index_name => $index_data) { - // Build a create string to compare to the query + + // Build a create string to compare to the query. $index_string = ''; if ($index_name == 'PRIMARY') { $index_string .= 'PRIMARY '; @@ -1763,39 +1788,44 @@ $index_string .= $index_name; } $index_columns = ''; - // For each column in the index + + // For each column in the index. foreach ($index_data['columns'] as $column_data) { if ($index_columns != '') $index_columns .= ','; - // Add the field to the column list string + + // Add the field to the column list string. $index_columns .= $column_data['fieldname']; if ($column_data['subpart'] != '') { $index_columns .= '('.$column_data['subpart'].')'; } } - // Add the column list to the index create string + // Add the column list to the index create string. $index_string .= ' ('.$index_columns.')'; if (!(($aindex = array_search($index_string, $indices)) === false)) { unset($indices[$aindex]); + // todo: Remove this? //echo "
{$table}:
Found index:".$index_string."\n";
}
+ // todo: Remove this?
//else echo "{$table}:
Did not find index:".$index_string."
".print_r($indices, true)."\n";
}
}
- // For every remaining index specified for the table
+ // For every remaining index specified for the table.
foreach ( (array) $indices as $index ) {
- // Push a query line into $cqueries that adds the index to that table
+ // Push a query line into $cqueries that adds the index to that table.
$cqueries[] = "ALTER TABLE {$table} ADD $index";
$for_update[] = 'Added index ' . $table . ' ' . $index;
}
- // Remove the original table creation query from processing
+ // Remove the original table creation query from processing.
unset( $cqueries[ $table ], $for_update[ $table ] );
}
$allqueries = array_merge($cqueries, $iqueries);
if ($execute) {
foreach ($allqueries as $query) {
+ // todo: Remove this?
//echo "".print_r($query, true)."\n"; $wpdb->query($query); } @@ -1847,9 +1877,10 @@ if (! file_exists("$home_path/index.php")) return false; - // Copy files from the old locations to the site theme. - // TODO: This does not copy arbitrary include dependencies. Only the - // standard WP files are copied. + /* + * Copy files from the old locations to the site theme. + * TODO: This does not copy arbitrary include dependencies. Only the standard WP files are copied. + */ $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php'); foreach ($files as $oldfile => $newfile) { @@ -1858,12 +1889,15 @@ else $oldpath = ABSPATH; - if ($oldfile == 'index.php') { // Check to make sure it's not a new index + // Check to make sure it's not a new index. + if ($oldfile == 'index.php') { $index = implode('', file("$oldpath/$oldfile")); if (strpos($index, 'WP_USE_THEMES') !== false) { if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) return false; - continue; // Don't copy anything + + // Don't copy anything. + continue; } } Index: src/wp-admin/includes/user.php =================================================================== --- src/wp-admin/includes/user.php (revision 29204) +++ src/wp-admin/includes/user.php (working copy) @@ -390,10 +390,11 @@ */ function default_password_nag_handler($errors = false) { global $user_ID; - if ( ! get_user_option('default_password_nag') ) //Short circuit it. + // Short-circuit it. + if ( ! get_user_option('default_password_nag') ) return; - //get_user_setting = JS saved UI setting. else no-js-fallback code. + // get_user_setting = JS saved UI setting. else no-js-fallback code. if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) { delete_user_setting('default_password_nag'); update_user_option($user_ID, 'default_password_nag', false, true); @@ -401,28 +402,33 @@ } add_action('profile_update', 'default_password_nag_edit_user', 10, 2); + /** * @since 2.8.0 */ function default_password_nag_edit_user($user_ID, $old_data) { - if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it. + // Short-circuit it. + if ( ! get_user_option('default_password_nag', $user_ID) ) return; $new_data = get_userdata($user_ID); - if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed. + // Remove the nag if the password has been changed. + if ( $new_data->user_pass != $old_data->user_pass ) { delete_user_setting('default_password_nag'); update_user_option($user_ID, 'default_password_nag', false, true); } } add_action('admin_notices', 'default_password_nag'); + /** * @since 2.8.0 */ function default_password_nag() { global $pagenow; - if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it. + // Short-circuit it. + if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) return; echo '
';
Index: src/wp-admin/includes/widgets.php
===================================================================
--- src/wp-admin/includes/widgets.php (revision 29204)
+++ src/wp-admin/includes/widgets.php (working copy)
@@ -173,11 +173,14 @@
$query_arg['key'] = $key;
}
- // We aren't showing a widget control, we're outputting a template for a multi-widget control
+ /*
+ * We aren't showing a widget control, we're outputting a template
+ * for a multi-widget control.
+ */
if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
// number == -1 implies a template where id numbers are replaced by a generic '__i__'
$control['params'][0]['number'] = -1;
- // with id_base widget id's are constructed like {$id_base}-{$id_number}
+ // With id_base widget id's are constructed like {$id_base}-{$id_number}.
if ( isset($control['id_base']) )
$id_format = $control['id_base'] . '-__i__';
}
Index: src/wp-admin/install-helper.php
===================================================================
--- src/wp-admin/install-helper.php (revision 29204)
+++ src/wp-admin/install-helper.php (working copy)
@@ -57,9 +57,10 @@
return true;
}
}
- //didn't find it try to create it.
+ // Didn't find it, so try to create it.
$wpdb->query($create_ddl);
- // we cannot directly tell that whether this succeeded!
+
+ // We cannot directly tell that whether this succeeded!
foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
if ($table == $table_name) {
return true;
@@ -90,9 +91,11 @@
return true;
}
}
- //didn't find it try to create it.
+
+ // Didn't find it, so try to create it.
$wpdb->query($create_ddl);
- // we cannot directly tell that whether this succeeded!
+
+ // We cannot directly tell that whether this succeeded!
foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
if ($column == $column_name) {
return true;
@@ -118,9 +121,11 @@
global $wpdb;
foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
if ($column == $column_name) {
- //found it try to drop it.
+
+ // Found it, so try to drop it.
$wpdb->query($drop_ddl);
- // we cannot directly tell that whether this succeeded!
+
+ // We cannot directly tell that whether this succeeded!
foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
if ($column == $column_name) {
return false;
@@ -128,7 +133,7 @@
}
}
}
- // else didn't find it
+ // Else didn't find it.
return true;
}
@@ -167,7 +172,8 @@
foreach ($results as $row ) {
if ($row->Field == $col_name) {
- // got our column, check the params
+
+ // Got our column, check the params.
if (($col_type != null) && ($row->Type != $col_type)) {
++$diffs;
}
Index: src/wp-admin/install.php
===================================================================
--- src/wp-admin/install.php (revision 29204)
+++ src/wp-admin/install.php (working copy)
@@ -222,7 +222,8 @@
$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
$admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
$public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
- // check e-mail address
+
+ // Check e-mail address.
$error = false;
if ( empty( $user_name ) ) {
// TODO: poka-yoke
Index: src/wp-admin/link-parse-opml.php
===================================================================
--- src/wp-admin/link-parse-opml.php (revision 29204)
+++ src/wp-admin/link-parse-opml.php (working copy)
@@ -45,13 +45,14 @@
if ( isset( $attrs['HTMLURL'] ) ) {
$url = $attrs['HTMLURL'];
}
- // save the data away.
+
+ // Save the data away.
$names[] = $name;
$urls[] = $url;
$targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] : '';
$feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] : '';
$descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] : '';
- } // end if outline
+ } // End if outline.
}
/**
@@ -64,7 +65,7 @@
* @param string $tagName XML tag name.
*/
function endElement($parser, $tagName) {
- // nothing to do.
+ // Nothing to do.
}
// Create an XML parser
Index: src/wp-admin/link.php
===================================================================
--- src/wp-admin/link.php (revision 29204)
+++ src/wp-admin/link.php (working copy)
@@ -30,7 +30,7 @@
case 'deletebookmarks' :
check_admin_referer('bulk-bookmarks');
- //for each link id (in $linkcheck[]) change category to selected value
+ // For each link id (in $linkcheck[]) change category to selected value.
if (count($linkcheck) == 0) {
wp_redirect($this_file);
exit;
@@ -50,14 +50,16 @@
case 'move' :
check_admin_referer('bulk-bookmarks');
- //for each link id (in $linkcheck[]) change category to selected value
+ // For each link id (in $linkcheck[]) change category to selected value.
if (count($linkcheck) == 0) {
wp_redirect($this_file);
exit;
}
$all_links = join(',', $linkcheck);
- // should now have an array of links we can change
- //$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+ /*
+ * Should now have an array of links we can change:
+ * $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+ */
wp_redirect($this_file);
exit;
Index: src/wp-admin/media-upload.php
===================================================================
--- src/wp-admin/media-upload.php (revision 29204)
+++ src/wp-admin/media-upload.php (working copy)
@@ -30,14 +30,14 @@
$ID = isset($ID) ? (int) $ID : 0;
$post_id = isset($post_id)? (int) $post_id : 0;
-// Require an ID for the edit screen
+// Require an ID for the edit screen.
if ( isset($action) && $action == 'edit' && !$ID )
wp_die( __( 'Cheatin’ uh?' ) );
if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
wp_die( __( 'Cheatin’ uh?' ) );
- // upload type: image, video, file, ..?
+ // Upload type: image, video, file, ..?
if ( isset($_GET['type']) ) {
$type = strval($_GET['type']);
} else {
@@ -52,7 +52,7 @@
$type = apply_filters( 'media_upload_default_type', 'file' );
}
- // tab: gallery, library, or type-specific
+ // Tab: gallery, library, or type-specific.
if ( isset($_GET['tab']) ) {
$tab = strval($_GET['tab']);
} else {
@@ -68,7 +68,7 @@
$body_id = 'media-upload';
- // let the action code decide how to handle the request
+ // Let the action code decide how to handle the request.
if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
/**
* Fires inside specific upload-type views in the legacy (pre-3.5.0)
Index: src/wp-admin/media.php
===================================================================
--- src/wp-admin/media.php (revision 29204)
+++ src/wp-admin/media.php (working copy)
@@ -40,7 +40,7 @@
exit;
}
- // no break
+ // No break.
case 'edit' :
$title = __('Edit Media');
Index: src/wp-admin/menu-header.php
===================================================================
--- src/wp-admin/menu-header.php (revision 29204)
+++ src/wp-admin/menu-header.php (working copy)
@@ -80,9 +80,12 @@
$img = $img_style = '';
$img_class = ' dashicons-before';
- // if the string 'none' (previously 'div') is passed instead of an URL, don't output the default menu image
- // so an icon can be added to div.wp-menu-image as background with CSS.
- // Dashicons and base64-encoded data:image/svg_xml URIs are also handled as special cases.
+ /*
+ * If the string 'none' (previously 'div') is passed instead of an URL, don't output
+ * the default menu image so an icon can be added to div.wp-menu-image as background
+ * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
+ * as special cases.
+ */
if ( ! empty( $item[6] ) ) {
$img = '
';
Index: src/wp-admin/menu.php
===================================================================
--- src/wp-admin/menu.php (revision 29204)
+++ src/wp-admin/menu.php (working copy)
@@ -121,7 +121,10 @@
$ptype_class = 'post';
}
- // if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position.
+ /*
+ * If $ptype_menu_position is already populated or will be populated
+ * by a hard-coded value below, increment the position.
+ */
$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
$ptype_menu_position++;
Index: src/wp-admin/nav-menus.php
===================================================================
--- src/wp-admin/nav-menus.php (revision 29204)
+++ src/wp-admin/nav-menus.php (working copy)
@@ -53,7 +53,8 @@
wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
break;
case 'move-down-menu-item' :
- // moving down a menu item is the same as moving up the next in order
+
+ // Moving down a menu item is the same as moving up the next in order.
check_admin_referer( 'move-menu_item' );
$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
if ( is_nav_menu_item( $menu_item_id ) ) {
@@ -63,7 +64,7 @@
$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
- // set up the data we need in one pass through the array of menu items
+ // Set up the data we need in one pass through the array of menu items.
$dbids_to_orders = array();
$orders_to_dbids = array();
foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
@@ -75,14 +76,14 @@
}
}
- // get next in order
+ // Get next in order.
if (
isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
) {
$next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
$next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
- // if not siblings of same parent, bubble menu item up but keep order
+ // If not siblings of same parent, bubble menu item up but keep order.
if (
! empty( $menu_item_data['menu_item_parent'] ) &&
(
@@ -102,7 +103,7 @@
}
- // make menu item a child of its next sibling
+ // Make menu item a child of its next sibling.
} else {
$next_item_data['menu_order'] = $next_item_data['menu_order'] - 1;
$menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
@@ -114,7 +115,7 @@
wp_update_post($next_item_data);
}
- // the item is last but still has a parent, so bubble up
+ // The item is last but still has a parent, so bubble up.
} elseif (
! empty( $menu_item_data['menu_item_parent'] ) &&
in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
@@ -136,7 +137,7 @@
$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
- // set up the data we need in one pass through the array of menu items
+ // Set up the data we need in one pass through the array of menu items.
$dbids_to_orders = array();
$orders_to_dbids = array();
foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
@@ -148,10 +149,10 @@
}
}
- // if this menu item is not first
+ // If this menu item is not first.
if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
- // if this menu item is a child of the previous
+ // If this menu item is a child of the previous.
if (
! empty( $menu_item_data['menu_item_parent'] ) &&
in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
@@ -164,7 +165,10 @@
if ( ! is_wp_error( $parent_object ) ) {
$parent_data = (array) $parent_object;
- // if there is something before the parent and parent a child of it, make menu item a child also of it
+ /*
+ * If there is something before the parent and parent a child of it,
+ * make menu item a child also of it.
+ */
if (
! empty( $dbids_to_orders[$parent_db_id] ) &&
! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
@@ -172,7 +176,10 @@
) {
$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
- // else if there is something before parent and parent not a child of it, make menu item a child of that something's parent
+ /*
+ * Else if there is something before parent and parent not a child of it,
+ * make menu item a child of that something's parent
+ */
} elseif (
! empty( $dbids_to_orders[$parent_db_id] ) &&
! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
@@ -183,24 +190,24 @@
else
$menu_item_data['menu_item_parent'] = 0;
- // else there isn't something before the parent
+ // Else there isn't something before the parent.
} else {
$menu_item_data['menu_item_parent'] = 0;
}
- // set former parent's [menu_order] to that of menu-item's
+ // Set former parent's [menu_order] to that of menu-item's.
$parent_data['menu_order'] = $parent_data['menu_order'] + 1;
- // set menu-item's [menu_order] to that of former parent
+ // Set menu-item's [menu_order] to that of former parent.
$menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
- // save changes
+ // Save changes.
update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
wp_update_post($menu_item_data);
wp_update_post($parent_data);
}
- // else this menu item is not a child of the previous
+ // Else this menu item is not a child of the previous.
} elseif (
empty( $menu_item_data['menu_order'] ) ||
empty( $menu_item_data['menu_item_parent'] ) ||
@@ -208,7 +215,7 @@
empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
$orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
) {
- // just make it a child of the previous; keep the order
+ // Just make it a child of the previous; keep the order.
$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
wp_update_post($menu_item_data);
@@ -232,7 +239,7 @@
if ( is_nav_menu( $nav_menu_selected_id ) ) {
$deletion = wp_delete_nav_menu( $nav_menu_selected_id );
} else {
- // Reset the selected menu
+ // Reset the selected menu.
$nav_menu_selected_id = 0;
unset( $_REQUEST['menu'] );
}
@@ -266,22 +273,22 @@
case 'update':
check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
- // Remove menu locations that have been unchecked
+ // Remove menu locations that have been unchecked.
foreach ( $locations as $location => $description ) {
if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
unset( $menu_locations[ $location ] );
}
- // Merge new and existing menu locations if any new ones are set
+ // Merge new and existing menu locations if any new ones are set.
if ( isset( $_POST['menu-locations'] ) ) {
$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
$menu_locations = array_merge( $menu_locations, $new_menu_locations );
}
- // Set menu locations
+ // Set menu locations.
set_theme_mod( 'nav_menu_locations', $menu_locations );
- // Add Menu
+ // Add Menu.
if ( 0 == $nav_menu_selected_id ) {
$new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
@@ -314,6 +321,7 @@
$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
set_theme_mod( 'nav_menu_locations', $menu_locations );
}
+
// $messages[] = '';
wp_redirect( admin_url( 'nav-menus.php?menu=' . $_nav_menu_selected_id ) );
exit();
@@ -322,7 +330,7 @@
$messages[] = '';
}
- // Update existing menu
+ // Update existing menu.
} else {
$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
@@ -344,7 +352,7 @@
}
}
- // Update menu items
+ // Update menu items.
if ( ! is_wp_error( $_menu_object ) ) {
$messages = array_merge( $messages, wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) );
}
@@ -371,7 +379,7 @@
break;
}
-// Get all nav menus
+// Get all nav menus.
$nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
$menu_count = count( $nav_menus );
@@ -380,7 +388,10 @@
$locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
-// If we have one theme location, and zero menus, we take them right into editing their first menu
+/*
+ * If we have one theme location, and zero menus, we take them right
+ * into editing their first menu.
+ */
$page_count = wp_count_posts( 'page' );
$one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
@@ -404,32 +415,35 @@
);
wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
-// Redirect to add screen if there are no menus and this users has either zero, or more than 1 theme locations
+/*
+ * Redirect to add screen if there are no menus and this users has either zero,
+ * or more than 1 theme locations.
+ */
if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
-// Get recently edited nav menu
+// Get recently edited nav menu.
$recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
$recently_edited = $nav_menu_selected_id;
-// Use $recently_edited if none are selected
+// Use $recently_edited if none are selected.
if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
$nav_menu_selected_id = $recently_edited;
-// On deletion of menu, if another menu exists, show it
+// On deletion of menu, if another menu exists, show it.
if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
$nav_menu_selected_id = $nav_menus[0]->term_id;
-// Set $nav_menu_selected_id to 0 if no menus
+// Set $nav_menu_selected_id to 0 if no menus.
if ( $one_theme_location_no_menus ) {
$nav_menu_selected_id = 0;
} elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
- // if we have no selection yet, and we have menus, set to the first one in the list
+ // if we have no selection yet, and we have menus, set to the first one in the list.
$nav_menu_selected_id = $nav_menus[0]->term_id;
}
-// Update the user's setting
+// Update the user's setting.
if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
@@ -439,23 +453,25 @@
$nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
}
-// Generate truncated menu names
+// Generate truncated menu names.
foreach( (array) $nav_menus as $key => $_nav_menu ) {
$nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
}
-// Retrieve menu locations
+// Retrieve menu locations.
if ( current_theme_supports( 'menus' ) ) {
$locations = get_registered_nav_menus();
$menu_locations = get_nav_menu_locations();
}
-// Ensure the user will be able to scroll horizontally
-// by adding a class for the max menu depth.
+/*
+ * Ensure the user will be able to scroll horizontally
+ * by adding a class for the max menu depth.
+ */
global $_wp_nav_menu_max_depth;
$_wp_nav_menu_max_depth = 0;
-// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth
+// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
if ( is_nav_menu( $nav_menu_selected_id ) ) {
$menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
$edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
@@ -510,7 +526,7 @@
'title' => __( 'Editing Menus' ),
'content' => $editing_menus
) );
-else : // Locations Tab
+else : // Locations Tab.
$locations_overview = '
' . sprintf( __( '%s has been created.' ), $nav_menu_selected_title ) . '
' . __( 'Please enter a valid menu name.' ) . '
' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '
'; $locations_overview .= '- ' . __( 'To assign menus to one or more theme locations, select a menu from each location’s drop down. When you’re finished, click Save Changes' ) . ' '; $locations_overview .= '
- ' . __( 'To edit a menu currently assigned to a theme location, click the adjacent ’Edit’ link' ) . ' '; @@ -529,7 +545,7 @@ '
' . __('Support Forums') . '
' ); -// Get the admin header +// Get the admin header. require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -644,7 +660,7 @@
*/
$assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
- // Adds ellipses following the number of locations defined in $assigned_locations
+ // Adds ellipses following the number of locations defined in $assigned_locations.
if ( ! empty( $assigned_locations ) ) {
printf( ' (%1$s%2$s)',
implode( ', ', $assigned_locations ),
Index: src/wp-admin/network/site-info.php
===================================================================
--- src/wp-admin/network/site-info.php (revision 29204)
+++ src/wp-admin/network/site-info.php (working copy)
@@ -59,10 +59,10 @@
update_option( 'home', $blog_address );
}
- // rewrite rules can't be flushed during switch to blog
+ // Rewrite rules can't be flushed during switch to blog.
delete_option( 'rewrite_rules' );
- // update blogs table
+ // Update blogs table.
$blog_data = wp_unslash( $_POST['blog'] );
$existing_details = get_blog_details( $id, false );
$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
Index: src/wp-admin/network.php
===================================================================
--- src/wp-admin/network.php (revision 29204)
+++ src/wp-admin/network.php (working copy)
@@ -533,7 +533,7 @@
check_admin_referer( 'install-network-1' );
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
- // create network tables
+ // Create network tables.
install_network();
$base = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
Index: src/wp-admin/options.php
===================================================================
--- src/wp-admin/options.php (revision 29204)
+++ src/wp-admin/options.php (working copy)
@@ -216,7 +216,7 @@
continue;
if ( is_serialized( $option->option_value ) ) {
if ( is_serialized_string( $option->option_value ) ) {
- // this is a serialized string, so we should display it
+ // This is a serialized string, so we should display it.
$value = maybe_unserialize( $option->option_value );
$options_to_update[] = $option->option_name;
$class = 'all-options';
Index: src/wp-admin/press-this.php
===================================================================
--- src/wp-admin/press-this.php (revision 29204)
+++ src/wp-admin/press-this.php (working copy)
@@ -40,7 +40,7 @@
$upload = false;
if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
foreach( (array) $_POST['photo_src'] as $key => $image) {
- // see if files exist in content - we don't want to upload non-used selected files.
+ // See if files exist in content - we don't want to upload non-used selected files.
if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
$desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : '';
$upload = media_sideload_image($image, $post_ID, $desc);
@@ -51,7 +51,7 @@
}
}
}
- // set the post_content and status
+ // Set the post_content and status.
$post['post_content'] = $content;
if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
$post['post_status'] = 'publish';
@@ -60,12 +60,12 @@
else
$post['post_status'] = 'draft';
- // error handling for media_sideload
+ // Error handling for media_sideload.
if ( is_wp_error($upload) ) {
wp_delete_post($post_ID);
wp_die($upload);
} else {
- // Post formats
+ // Post formats.
if ( isset( $_POST['post_format'] ) ) {
if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) )
set_post_format( $post_ID, $_POST['post_format'] );
@@ -181,9 +181,10 @@
return '';
$sources = array();
foreach ($matches[3] as $src) {
- // if no http in url
+
+ // If no http in URL.
if (strpos($src, 'http') === false)
- // if it doesn't have a relative uri
+ // If it doesn't have a relative URI.
if ( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
$src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
else
@@ -197,7 +198,7 @@
break;
case 'photo_js': ?>
- // gather images and load some default JS
+ // Gather images and load some default JS.
var last = null
var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
if(photostorage == false) {
@@ -438,12 +439,14 @@
}
}
jQuery(document).ready(function($) {
- //resize screen
+ // Resize screen.
window.resizeTo(760,580);
- // set button actions
+
+ // Set button actions.
jQuery('#photo_button').click(function() { show('photo'); return false; });
jQuery('#video_button').click(function() { show('video'); return false; });
- // auto select
+
+ // Auto select.
show('video');
Index: src/wp-admin/setup-config.php
===================================================================
--- src/wp-admin/setup-config.php (revision 29204)
+++ src/wp-admin/setup-config.php (working copy)
@@ -300,8 +300,10 @@
$sb ) {
if ( is_array($sb) )
@@ -224,7 +224,7 @@
$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
- // show the widget form
+ // Show the widget form.
$width = ' style="width:' . max($control['width'], 350) . 'px"';
$key = isset($_GET['key']) ? (int) $_GET['key'] : 0;