Merge remote-tracking branch 'origin/master'

# Conflicts:
#	application/common.php

application/common.php

@@ -458,7 +458,7 @@ function isMobile($mobile) {
 function isCardId($card_id)
 {
     $pattern = '/^[1-9]d{5}(19|20)d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2]d)|(3[0-1]))d{3}[0-9xX]$/';
-    if(preg_match($pattern, $id_number)) {
+    if(preg_match($pattern, $card_id)) {
         return true;
     } else {
         return false;