X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-includes/pomo/entry.php

diff --git a/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php
index 07ddfd4d..ca706fca 100644
--- 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
  */
@@ -40,7 +40,7 @@ class Translation_Entry {
 	 * 	- references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
 	 * 	- flags (array) -- flags like php-format
 	 */
-	function Translation_Entry($args=array()) {
+	function __construct( $args = array() ) {
 		// if no singular -- empty object
 		if (!isset($args['singular'])) {
 			return;
@@ -55,6 +55,13 @@ class Translation_Entry {
 		if (!is_array($this->flags)) $this->flags = array();
 	}
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Translation_Entry( $args = array() ) {
+		self::__construct( $args );
+	}
+
 	/**
 	 * Generates a unique key for this entry
 	 *
@@ -65,5 +72,17 @@ class Translation_Entry {
 		// prepend context and EOT, like in MO files
 		return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
 	}
+
+	/**
+	 * @param object $other
+	 */
+	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