Changeset 18528 for trunk/wp-includes/pomo/entry.php

Timestamp:

08/11/2011 04:29:35 AM (15 years ago)

Author:

nbachiyski

Message:

Sync pomo library with the current GlotPress version

File:

• trunk/wp-includes/pomo/entry.php (modified) (2 diffs)

trunk/wp-includes/pomo/entry.php

@@ -3 +3 @@
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 406 2010-02-07 11:10:24Z nbachiyski $
+ * @version $Id: entry.php 621 2011-06-13 12:21:50Z nbachiyski $
  * @package pomo
  * @subpackage entry
@@ -66 +66 @@
         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;