WordPress 4.4

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

diff --git a/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php
index 1757061960f6ebfc59fb7f15cdd18f2428a82292..6bc44d614d69c899078889a62f8035ae44f8131e 100644 (file)
--- a/wp-includes/pomo/mo.php
+++ b/wp-includes/pomo/mo.php
@@ -2,7 +2,7 @@
 /**
  * Class for working with MO files
  *
- * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
+ * @version $Id: mo.php 1157 2015-11-20 04:30:11Z dd32 $
  * @package pomo
  * @subpackage mo
  */
@@ -10,7 +10,7 @@
 require_once dirname(__FILE__) . '/translations.php';
 require_once dirname(__FILE__) . '/streams.php';
 
-if ( !class_exists( 'MO' ) ):
+if ( ! class_exists( 'MO', false ) ):
 class MO extends Gettext_Translations {
 
        var $_nplurals = 2;
@@ -124,7 +124,7 @@ class MO extends Gettext_Translations {
                //TODO: warnings for control characters
                $exported = $entry->singular;
                if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-               if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
+               if ($entry->context) $exported = $entry->context . chr(4) . $exported;
                return $exported;
        }
 
@@ -134,7 +134,7 @@ class MO extends Gettext_Translations {
         */
        function export_translations($entry) {
                //TODO: warnings for control characters
-               return implode(chr(0), $entry->translations);
+               return $entry->is_plural ? implode(chr(0), $entry->translations) : $entry->translations[0];
        }
 
        /**