MERGE: リビジョン1647-1649をマージ

[nucleus-jp/nucleus-next.git] / nucleus / libs / skinie.php

diff --git a/nucleus/libs/skinie.php b/nucleus/libs/skinie.php
index bacb61f..165f556 100644 (file)
--- a/nucleus/libs/skinie.php
+++ b/nucleus/libs/skinie.php
@@ -18,7 +18,8 @@
  * @version $Id: skinie.php 1624 2012-01-09 11:36:20Z sakamocchi $
  */
 
-class SKINIMPORT {
+class SKINIMPORT
+{
        // hardcoded value (see constructor). When 1, interesting info about the
        // parsing process is sent to the output
        private $debug;
@@ -456,7 +457,7 @@ class SKINIMPORT {
        /**
          * Called by the XML parser for each closing tag encountered
          */
-       private function end_elment($parser, $name)
+       private function end_element($parser, $name)
        {
                if ( $this->debug )
                {
@@ -468,6 +469,10 @@ class SKINIMPORT {
                        $name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());
                        $charset_data = i18n::convert($this->get_character_data(), $this->parse_charset, i18n::get_current_charset());
                }
+               else
+               {
+                       $charset_data = $this->get_character_data();
+               }
                
                switch ( $name )
                {