Changeset 16303

Timestamp:

11/11/2010 04:22:18 PM (16 years ago)

Author:

ryan

Message:

Prevent stomping of global. Props prettyboymp. fixes #13945

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• general-template.php (modified) (2 diffs)
• query.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1345 +1345 @@
  */
 function is_new_day() {
-        global $day, $previousday;
-        if ( $day != $previousday )
+        global $currentday, $previousday;
+        if ( $currentday != $previousday )
                 return 1;
         else

trunk/wp-includes/general-template.php

@@ -1353 +1353 @@
  */
 function the_date( $d = '', $before = '', $after = '', $echo = true ) {
-        global $day, $previousday;
+        global $currentday, $previousday;
         $the_date = '';
-        if ( $day != $previousday ) {
+        if ( $currentday != $previousday ) {
                 $the_date .= $before;
                 $the_date .= get_the_date( $d );
                 $the_date .= $after;
-                $previousday = $day;
+                $previousday = $currentday;
 
                 $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
@@ -1565 +1565 @@
         global $wp_locale, $post, $day, $previousweekday;
         $the_weekday_date = '';
-        if ( $day != $previousweekday ) {
+        if ( $currentday != $previousweekday ) {
                 $the_weekday_date .= $before;
                 $the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
                 $the_weekday_date .= $after;
-                $previousweekday = $day;
+                $previousweekday = $currentday;
         }
         $the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);

trunk/wp-includes/query.php

@@ -3189 +3189 @@
  */
 function setup_postdata($post) {
-        global $id, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages;
+        global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
         $id = (int) $post->ID;
@@ -3195 +3195 @@
         $authordata = get_userdata($post->post_author);
 
-        $day = mysql2date('d.m.y', $post->post_date, false);
+        $currentday = mysql2date('d.m.y', $post->post_date, false);
         $currentmonth = mysql2date('m', $post->post_date, false);
         $numpages = 1;