g5 merge 충돌수정

2014-01-03 14:35:35 +09:00
parent 5afc9eab34 b2251d9ea8
commit f26b0c838b
23 changed files with 101 additions and 61 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -2505,4 +2505,18 @@ function module_exec_check($exe, $type)

    return $error;
 }
+
+// 도로명 상세 주소처리
+function get_address2($addr2, $addr3)
+{
+    if($addr3) {
+        if($addr2) {
+            $addr2 .= ' '.$addr3;
+        } else {
+            $addr2 = $addr3;
+        }
+    }
+
+    return $addr2;
+}
 ?>