Changeset 38026

Timestamp:

07/09/2016 03:10:38 PM (8 years ago)

Author:

karmatosed

Message:

PHP 7 compatibility issues fixed in Twenty Thirteen and Twenty Fourteen
Props xknown
Fixes #37227
--This Line, and those below, will be ignored--

M themes/twentyfourteen/functions.php
M themes/twentythirteen/functions.php

Location:

trunk/src/wp-content/themes

Files:

• twentyfourteen/functions.php (modified) (1 diff)
• twentythirteen/functions.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -320 +320 @@
     // If there is more than 1 attachment in a gallery...
     if ( count( $attachment_ids ) > 1 ) {
-        foreach ( $attachment_ids as $attachment_id ) {
+        foreach ( $attachment_ids as $idx => $attachment_id ) {
             if ( $attachment_id == $post->ID ) {
-                $next_id = current( $attachment_ids );
+                $next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
                 break;
             }

trunk/src/wp-content/themes/twentythirteen/functions.php

@@ -422 +422 @@
     // If there is more than 1 attachment in a gallery...
     if ( count( $attachment_ids ) > 1 ) {
-        foreach ( $attachment_ids as $attachment_id ) {
+        foreach ( $attachment_ids as $idx => $attachment_id ) {
             if ( $attachment_id == $post->ID ) {
-                $next_id = current( $attachment_ids );
+                $next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
                 break;
             }