WordPress 3.5-scripts

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

diff --git a/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php
index feb5b34cf2fa474883e110c9c76b168b30aad1c0..097e92ca55fcc62c04dbb0f859d554cfd9db7dbe 100644 (file)
--- a/wp-includes/pomo/entry.php
+++ b/wp-includes/pomo/entry.php
@@ -2,12 +2,12 @@
 /**
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 115 2009-05-11 18:56:15Z nbachiyski $
+ * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
  * @package pomo
  * @subpackage entry
  */
 
-
+if ( !class_exists( 'Translation_Entry' ) ):
 /**
  * Translation_Entry class encapsulates a translatable string
  */
@@ -46,7 +46,6 @@ class Translation_Entry {
                        return;
                }
                // get member variable values from args hash
-               $object_varnames = array_keys(get_object_vars($this));
                foreach ($args as $varname => $value) {
                        $this->$varname = $value;
                }
@@ -66,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