Changeset 29206 for trunk/src/wp-admin/includes/template.php

Timestamp:

07/17/2014 09:13:53 AM (12 years ago)

Author:

DrewAPicture

Message:

Fix syntax for single- and multi-line comments in wp-admin-directory files.

See #28931.

File:

• trunk/src/wp-admin/includes/template.php (modified) (7 diffs)

trunk/src/wp-admin/includes/template.php

@@ -584 +584 @@
         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;
@@ -717 +717 @@
                 $tab_index_attribute = " tabindex=\"$tab_index\"";
 
+        // todo: Remove this?
         // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
 
@@ -941 +942 @@
                                 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];
@@ -948 +953 @@
                                 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'];
@@ -957 +965 @@
                                 $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]);
@@ -1341 +1349 @@
         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' ) );
@@ -1353 +1363 @@
         }
 
-        // 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();