Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

2018-06-12 22:28:10 +09:00
parent 2f030a6dd6 7317b8bc18
commit 54df034c77
1 changed files with 7 additions and 1 deletions
@@ -560,11 +560,17 @@ class JosaUtil{
        return JosaUtil::checkText($target, $isRo);
    }

-    public static function pick(string $text, string $wJongsung, string $woJongsung=''){
+    public static function pick($text, string $wJongsung, string $woJongsung=''){
        /* NOTE:원본 코드와 인자 순서가 다름.
         * 원본은 pick('바람', '랑', '이랑'); 이었다면 JosaUtil::pick('바람', '이랑', '랑'); 으로 바뀜.
         * JosaUtil::pick('바람', '은', '는'); JosaUti::pick('바람', '이', '가');처럼 쓰기 위해서임.
         */
+		if($text === null){
+			$text = '';
+		}
+		else{
+			$text = (string)$text;
+		}
        JosaUtil::init();

        if(!$woJongsung){