OSDN Git Service

- fixed error handling bug in executing "ethna add-view" command.
authormumumu-org <mumumu-org@2ef88817-412d-0410-a32c-8029a115e976>
Sat, 15 Nov 2008 23:06:07 +0000 (23:06 +0000)
committermumumu-org <mumumu-org@2ef88817-412d-0410-a32c-8029a115e976>
Sat, 15 Nov 2008 23:06:07 +0000 (23:06 +0000)
class/Plugin/Handle/Ethna_Plugin_Handle_AddView.php

index 3329e50..e072d14 100644 (file)
@@ -107,7 +107,11 @@ class Ethna_Plugin_Handle_AddView extends Ethna_Plugin_Handle_AddAction
                 return Ethna::raiseError("You specified locale, but invalid : $locale", 'usage');
             }
         } else {
-            $locale = $ctl->getLocale();
+            if (Ethna::isError($ctl)) {
+                $locale = 'ja_JP';
+            } else {
+                $locale = $ctl->getLocale();
+            }
         }
 
         // encoding
@@ -120,7 +124,11 @@ class Ethna_Plugin_Handle_AddView extends Ethna_Plugin_Handle_AddAction
                 }
             }
         } else {
-            $encoding = $ctl->getClientEncoding();
+            if (Ethna::isError($ctl)) {
+                $encoding = 'UTF-8';
+            } else {
+                $encoding = $ctl->getClientEncoding();
+            }
         }
 
         $r =& Ethna_Generator::generate('Template', $basedir,