Changeset 57192 for trunk/src/wp-includes/bookmark.php

Timestamp:

12/15/2023 02:31:56 PM (12 months ago)

Author:

SergeyBiryukov

Message:

General: Revert code changes from [57191].

The unit tests for get_bookmark() expect the function to modify the $GLOBALS array directly.

Follow-up to [57191].

See #60021.

File:

• trunk/src/wp-includes/bookmark.php (modified) (2 diffs)

trunk/src/wp-includes/bookmark.php

@@ -23 +23 @@
  */
 function get_bookmark( $bookmark, $output = OBJECT, $filter = 'raw' ) {
-    global $link, $wpdb;
+    global $wpdb;
 
     if ( empty( $bookmark ) ) {
-        if ( isset( $link ) ) {
-            $_bookmark = &$link;
+        if ( isset( $GLOBALS['link'] ) ) {
+            $_bookmark = & $GLOBALS['link'];
         } else {
             $_bookmark = null;
@@ -35 +35 @@
         $_bookmark = $bookmark;
     } else {
-        if ( isset( $link ) && ( $link->link_id == $bookmark ) ) {
-            $_bookmark = &$link;
+        if ( isset( $GLOBALS['link'] ) && ( $GLOBALS['link']->link_id == $bookmark ) ) {
+            $_bookmark = & $GLOBALS['link'];
         } else {
             $_bookmark = wp_cache_get( $bookmark, 'bookmark' );