Changeset 43659

Timestamp:

09/24/2018 08:56:59 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Twenty Seventeen: Use a simple counter incremented with each call instead of uniqid() for generating unique IDs for HTML elements.

Props westonruter.
Fixes #44883.

Location:

trunk/src/wp-content/themes/twentyseventeen

Files:

• functions.php (modified) (1 diff)
• inc/icon-functions.php (modified) (1 diff)
• searchform.php (modified) (1 diff)

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

@@ -591 +591 @@
 
 /**
+ * Get unique ID.
+ *
+ * This is a PHP implementation of Underscore's uniqueId method. A static variable
+ * contains an integer that is incremented with each call. This number is returned
+ * with the optional prefix. As such the returned value is not universally unique,
+ * but it is unique across the life of the PHP process.
+ *
+ * @since Twenty Seventeen 1.8
+ * @see wp_unique_id() Themes requiring WordPress 4.9.9 and greater should use this instead.
+ *
+ * @staticvar int $id_counter
+ *
+ * @param string $prefix Prefix for the returned ID.
+ * @return string Unique ID.
+ */
+function twentyseventeen_unique_id( $prefix = '' ) {
+    static $id_counter = 0;
+    if ( function_exists( 'wp_unique_id' ) ) {
+        return wp_unique_id( $prefix );
+    }
+    return $prefix . (string) ++$id_counter;
+}
+
+/**
  * Implement the Custom Header feature.
  */

trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php

@@ -75 +75 @@
     if ( $args['title'] ) {
         $aria_hidden     = '';
-        $unique_id       = uniqid();
+        $unique_id       = twentyseventeen_unique_id();
         $aria_labelledby = ' aria-labelledby="title-' . $unique_id . '"';
 

trunk/src/wp-content/themes/twentyseventeen/searchform.php

@@ -11 +11 @@
 ?>
 
-<?php $unique_id = esc_attr( uniqid( 'search-form-' ) ); ?>
+<?php $unique_id = esc_attr( twentyseventeen_unique_id( 'search-form-' ) ); ?>
 
 <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">