Make WordPress Core

Ticket #24302: 24302.dif

File 24302.dif, 6.1 KB (added by TheLastCicada, 12 years ago)
Line 
1Index: wp-includes/post.php
2===================================================================
3--- wp-includes/post.php        (revision 24228)
4+++ wp-includes/post.php        (working copy)
5@@ -1074,7 +1074,7 @@
6  *     * While the default settings of exclude_from_search, publicly_queryable, show_ui, and show_in_nav_menus are
7  *       inherited from public, each does not rely on this relationship and controls a very specific intention.
8  * - exclude_from_search - Whether to exclude posts with this post type from front end search results.
9- *     * If not set, the the opposite of public's current value is used.
10+ *     * If not set, the opposite of public's current value is used.
11  * - publicly_queryable - Whether queries can be performed on the front end for the post type as part of parse_request().
12  *     * ?post_type={post_type_key}
13  *     * ?{post_type_key}={single_post_slug}
14Index: wp-includes/class-wp-theme.php
15===================================================================
16--- wp-includes/class-wp-theme.php      (revision 24228)
17+++ wp-includes/class-wp-theme.php      (working copy)
18@@ -87,7 +87,7 @@
19        /**
20         * The directory name of the theme's files, inside the theme root.
21         *
22-        * In the case of a child theme, this is directory name of the the child theme.
23+        * In the case of a child theme, this is directory name of the child theme.
24         * Otherwise, 'stylesheet' is the same as 'template'.
25         *
26         * @access private
27@@ -720,7 +720,7 @@
28        /**
29         * The directory name of the theme's "stylesheet" files, inside the theme root.
30         *
31-        * In the case of a child theme, this is directory name of the the child theme.
32+        * In the case of a child theme, this is directory name of the child theme.
33         * Otherwise, get_stylesheet() is the same as get_template().
34         *
35         * @since 3.4.0
36Index: wp-includes/class-simplepie.php
37===================================================================
38--- wp-includes/class-simplepie.php     (revision 24228)
39+++ wp-includes/class-simplepie.php     (working copy)
40@@ -827,7 +827,7 @@
41        }
42 
43        /**
44-        * Set the the default timeout for fetching remote feeds
45+        * Set the default timeout for fetching remote feeds
46         *
47         * This allows you to change the maximum time the feed's server to respond
48         * and send the feed back.
49@@ -3116,4 +3116,4 @@
50                }
51        }
52 }
53-endif;
54\ No newline at end of file
55+endif;
56Index: wp-includes/functions.php
57===================================================================
58--- wp-includes/functions.php   (revision 24228)
59+++ wp-includes/functions.php   (working copy)
60@@ -2743,7 +2743,7 @@
61  * search engines from caching the message. Custom DB messages should do the
62  * same.
63  *
64- * This function was backported to the the WordPress 2.3.2, but originally was
65+ * This function was backported to the WordPress 2.3.2, but originally was
66  * added in WordPress 2.5.0.
67  *
68  * @since 2.3.2
69Index: wp-includes/formatting.php
70===================================================================
71--- wp-includes/formatting.php  (revision 24228)
72+++ wp-includes/formatting.php  (working copy)
73@@ -1913,7 +1913,7 @@
74  *
75  * @since 1.2.0
76  *
77- * @uses get_option() to retrieve the the value of 'gmt_offset'.
78+ * @uses get_option() to retrieve the value of 'gmt_offset'.
79  * @param string $string The date to be converted.
80  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
81  * @return string GMT version of the date provided.
82@@ -3390,4 +3390,4 @@
83  */
84 function wp_unslash( $value ) {
85        return stripslashes_deep( $value );
86-}
87\ No newline at end of file
88+}
89Index: wp-includes/feed.php
90===================================================================
91--- wp-includes/feed.php        (revision 24228)
92+++ wp-includes/feed.php        (working copy)
93@@ -391,7 +391,7 @@
94                        foreach ( (array) $val as $enc ) {
95                                $enclosure = explode("\n", $enc);
96 
97-                               //only get the the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
98+                               //only get the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
99                                $t = preg_split('/[ \t]/', trim($enclosure[2]) );
100                                $type = $t[0];
101 
102Index: wp-includes/class-json.php
103===================================================================
104--- wp-includes/class-json.php  (revision 24228)
105+++ wp-includes/class-json.php  (working copy)
106@@ -438,7 +438,7 @@
107             case 'array':
108                /*
109                 * As per JSON spec if any array key is not an integer
110-                * we must treat the the whole array as an object. We
111+                * we must treat the whole array as an object. We
112                 * also try to catch a sparsely populated associative
113                 * array with numeric keys here because some JS engines
114                 * will create an array with empty indexes up to
115@@ -447,8 +447,8 @@
116                 * otherwise.
117                 *
118                 * As per the ECMA and JSON specification an object may
119-                * have any string as a property. Unfortunately due to
120-                * a hole in the ECMA specification if the key is a
121+                * have any string as a property. Unfortunately, due to
122+                * a hole in the ECMA specification, if the key is a
123                 * ECMA reserved word or starts with a digit the
124                 * parameter is only accessible using ECMAScript's
125                 * bracket notation.
126@@ -933,4 +933,4 @@
127     
128 }
129 
130-endif;
131\ No newline at end of file
132+endif;
133Index: wp-admin/includes/widgets.php
134===================================================================
135--- wp-admin/includes/widgets.php       (revision 24228)
136+++ wp-admin/includes/widgets.php       (working copy)
137@@ -58,7 +58,7 @@
138 
139 /**
140  * Show the widgets and their settings for a sidebar.
141- * Used in the the admin widget config screen.
142+ * Used in the admin widget config screen.
143  *
144  * @since 2.5.0
145  *
146Index: wp-admin/js/revisions.js
147===================================================================
148--- wp-admin/js/revisions.js    (revision 24228)
149+++ wp-admin/js/revisions.js    (working copy)
150@@ -621,7 +621,7 @@
151                        }, true );
152                },
153 
154-               // go the the previous revision
155+               // go the previous revision
156                previousRevision: function() {
157                        if ( Diff.rightDiff > 1 ) // unless at left boundry
158                                Diff.rightDiff = Diff.rightDiff - 1 ;