WordPress 4.0-scripts

[autoinstalls/wordpress.git] / wp-includes / pomo / entry.php

diff --git a/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php
index 07ddfd4d11022e315a10d61d8f3610b0d5c15fd8..097e92ca55fcc62c04dbb0f859d554cfd9db7dbe 100644 (file)
--- a/wp-includes/pomo/entry.php
+++ b/wp-includes/pomo/entry.php
@@ -2,7 +2,7 @@
 /**
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 406 2010-02-07 11:10:24Z nbachiyski $
+ * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
  * @package pomo
  * @subpackage entry
  */
@@ -65,5 +65,14 @@ class Translation_Entry {
                // prepend context and EOT, like in MO files
                return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
        }
+
+       function merge_with(&$other) {
+               $this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
+               $this->references = array_unique( array_merge( $this->references, $other->references ) );
+               if ( $this->extracted_comments != $other->extracted_comments ) {
+                       $this->extracted_comments .= $other->extracted_comments;
+               }
+
+       }
 }
 endif;
\ No newline at end of file