Merge branch 'master' of github.com:gnuboard/g5

2019-09-06 12:29:07 +09:00
parent 86e550895c d33753014c
commit cb37a9d52c
6 changed files with 9 additions and 8 deletions
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@ -48,10 +48,6 @@ function get_social_callbackurl($provider, $no_domain=false){

    $base_url = G5_SOCIAL_LOGIN_BASE_URL;

-    if( $provider === 'kakao' && $no_domain ){
-        $base_url = '/'.ltrim(parse_url($base_url, PHP_URL_PATH), '/');
-    }
-
    if ( $provider === 'twitter' ){
        return $base_url;
    }