Changeset 39591 for trunk/src/wp-includes/pomo/po.php

Timestamp:

12/13/2016 01:48:41 AM (10 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/pomo/po.php (modified) (8 diffs)

trunk/src/wp-includes/pomo/po.php

@@ -168 +168 @@
          */
         public static function prepend_each_line($string, $with) {
-                $php_with = var_export($with, true);
                 $lines = explode("\n", $string);
-                // do not prepend the string on the last empty line, artefact by explode
-                if ("\n" == substr($string, -1)) unset($lines[count($lines) - 1]);
-                $res = implode("\n", array_map(create_function('$x', "return $php_with.\$x;"), $lines));
-                // give back the empty line, we ignored above
-                if ("\n" == substr($string, -1)) $res .= "\n";
-                return $res;
+                $append = '';
+                if ('' === end($lines)) {
+                        // Last line might be empty because $string was terminated
+                        // with a newline, remove it from the $lines array,
+                        // we'll restore state by re-terminating the string at the end
+                        array_pop($lines);
+                        $append = "\n";
+                }
+                foreach ($lines as &$line) {
+                        $line = $with . $line;
+                }
+                unset($line);
+                return implode("\n", $lines) . $append;
         }
 
@@ -281 +287 @@
 
         /**
+         * Helper function for read_entry
+         * @param string $context
+         * @return bool
+         */
+        protected static function is_final($context) {
+                return ($context === 'msgstr') || ($context === 'msgstr_plural');
+        }
+
+        /**
          * @param resource $f
          * @param int      $lineno
@@ -291 +306 @@
                 $context = '';
                 $msgstr_index = 0;
-                $is_final = create_function('$context', 'return $context == "msgstr" || $context == "msgstr_plural";');
                 while (true) {
                         $lineno++;
@@ -297 +311 @@
                         if (!$line)  {
                                 if (feof($f)) {
-                                        if ($is_final($context))
+                                        if (self::is_final($context))
                                                 break;
                                         elseif (!$context) // we haven't read a line and eof came
@@ -311 +325 @@
                         if (preg_match('/^#/', $line, $m)) {
                                 // the comment is the start of a new entry
-                                if ($is_final($context)) {
+                                if (self::is_final($context)) {
                                         PO::read_line($f, 'put-back');
                                         $lineno--;
@@ -323 +337 @@
                                 $this->add_comment_to_entry($entry, $line);
                         } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
-                                if ($is_final($context)) {
+                                if (self::is_final($context)) {
                                         PO::read_line($f, 'put-back');
                                         $lineno--;
@@ -334 +348 @@
                                 $entry->context .= PO::unpoify($m[1]);
                         } elseif (preg_match('/^msgid\s+(".*")/', $line, $m)) {
-                                if ($is_final($context)) {
+                                if (self::is_final($context)) {
                                         PO::read_line($f, 'put-back');
                                         $lineno--;
@@ -384 +398 @@
                         }
                 }
-                if (array() == array_filter($entry->translations, create_function('$t', 'return $t || "0" === $t;'))) {
+
+                $have_translations = false;
+                foreach ( $entry->translations as $t ) {
+                        if ( $t || ('0' === $t) ) {
+                                $have_translations = true;
+                                break;
+                        }
+                }
+                if ( false === $have_translations ) {
                         $entry->translations = array();
                 }
+
                 return array('entry' => $entry, 'lineno' => $lineno);
         }