Make WordPress Core


Ignore:
Timestamp:
10/31/2012 10:13:51 PM (12 years ago)
Author:
nbachiyski
Message:

Sync POMO with GlotPress

See http://glotpress.trac.wordpress.org/browser/trunk/pomo/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/pomo/entry.php

    r18528 r22349  
    33 * Contains Translation_Entry class
    44 *
    5  * @version $Id: entry.php 621 2011-06-13 12:21:50Z nbachiyski $
     5 * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
    66 * @package pomo
    77 * @subpackage entry
     
    6666        return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
    6767    }
    68    
     68
    6969    function merge_with(&$other) {
    7070        $this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
     
    7373            $this->extracted_comments .= $other->extracted_comments;
    7474        }
    75        
     75
    7676    }
    7777}
Note: See TracChangeset for help on using the changeset viewer.