Changeset 39591 for trunk/src/wp-includes/atomlib.php

Timestamp:

12/13/2016 01:48:41 AM (8 years ago)

Author:

rmccue

Message:

General: Remove most uses of create_function()

create_function() is equivalent to eval(), and most of our uses can be refactored. This is simpler, more secure, and slightly more performant.

Props sgolemon.
Fixes #37082.

File:

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

trunk/src/wp-includes/atomlib.php

@@ -95 +95 @@
         $this->feed = new AtomFeed();
         $this->current = null;
-        $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
-        $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
+        $this->map_attrs_func = array( __CLASS__, 'map_attrs' );
+        $this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
     }
 
@@ -104 +104 @@
     public function AtomParser() {
         self::__construct();
+    }
+
+    /**
+     * Map attributes to key="val"
+     *
+     * @param string $k Key
+     * @param string $v Value
+     * @return string
+     */
+    public static function map_attrs($k, $v) {
+        return "$k=\"$v\"";
+    }
+
+    /**
+     * Map XML namespace to string.
+     *
+     * @param indexish $p XML Namespace element index
+     * @param array $n Two-element array pair. [ 0 => {namespace}, 1 => {url} ]
+     * @return string 'xmlns="{url}"' or 'xmlns:{namespace}="{url}"'
+     */
+    public static function map_xmlns($p, $n) {
+        $xd = "xmlns";
+        if( 0 < strlen($n[0]) ) {
+            $xd .= ":{$n[0]}";
+        }
+        return "{$xd}=\"{$n[1]}\"";
     }