Ticket #37082: 0004-Remove-unnecessary-use-of-create_function-in-AtomFee.patch

wp-includes/atomlib.php

@@ -94 +94 @@
 
         $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__, 'defaultMapAttrsFunc' );
+        $this->map_xmlns_func = array( __CLASS__, 'defaultMapXmlnsFunc' );
     }
 
         /**
@@ -105 +105 @@
                 self::__construct();
         }
 
+        /**
+         * Default map_attrs_func implementation
+         * Produces '{key}="{$val}" with no escaping
+         *
+         * @param string $k - Key
+         * @param string $v - Val
+         */
+        public static function defaultMapAttrsFunc($k, $v) {
+                return "$k=\"$v\"";
+        }
+
+        /**
+         * Default map_xmlns_func implementation
+         * Produces 'xmlns="{url}"' or 'xmlns:{namespace}="{url}"'
+         *
+         * @param indexish $p - XML Namespace element index
+         * @param array $n - Two-element array pair. [ 0 => {namespace}, 1 => {url} ]
+         * @return string
+         */
+        public static function defaultMapXmlnsFunc($p, $n) {
+                $xd = "xmlns";
+                if( 0 < strlen($n[0]) ) {
+                        $xd .= ":{$n[0]}";
+                }
+                return "{$xd}=\"{$n[1]}\"";
+        }
+
     function _p($msg) {
         if($this->debug) {
             print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";