From ba88ecc44347b1d9ea0efb8e5f5be97fd6cc0c2b Mon Sep 17 00:00:00 2001 From: haneul Date: Sat, 6 Feb 2010 14:20:18 +0000 Subject: [PATCH 1/3] #18680860 : fixed an easy-install error occurred when adjusting permission with ftp_site function (it does not occur if ftp_chmod function exists) git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7283 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/autoinstall.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index 1eddbe050..84c0e6eaa 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -213,7 +213,7 @@ } else { - if(!ftp_site("CHMOD 755 ".$ftp_path)) + if(!ftp_site($connection, "CHMOD 755 ".$ftp_path)) { return new Object(-1, "msg_permission_adjust_failed"); } From 8c0d04d8b92b8b31d1530596bdf446910aceff8d Mon Sep 17 00:00:00 2001 From: haneul Date: Sat, 6 Feb 2010 14:45:31 +0000 Subject: [PATCH 2/3] #18680020 : if association does not exists, it should return null (not association object) git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7284 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/php-openid-1.2.3/Auth/OpenID/XEStore.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/member/php-openid-1.2.3/Auth/OpenID/XEStore.php b/modules/member/php-openid-1.2.3/Auth/OpenID/XEStore.php index 7ca9e7615..540117172 100644 --- a/modules/member/php-openid-1.2.3/Auth/OpenID/XEStore.php +++ b/modules/member/php-openid-1.2.3/Auth/OpenID/XEStore.php @@ -149,6 +149,7 @@ class Auth_OpenID_XEStore extends Auth_OpenID_OpenIDStore { function getAssociation($server_url, $handle = null) { $assoc = $this->_get_assoc($server_url, $handle); + if(!$assoc) return null; $assoc_o = new Auth_OpenID_Association($assoc->handle, $assoc->secret, $assoc->issued, $assoc->lifetime, $assoc->assoc_type); return $assoc_o; } From 00ffe1175ba666a3f6ad4affa2050acee216f889 Mon Sep 17 00:00:00 2001 From: haneul Date: Sat, 6 Feb 2010 14:47:00 +0000 Subject: [PATCH 3/3] version up to 1.4.0.5 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7286 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.inc.php b/config/config.inc.php index 1db365229..780f03425 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -13,7 +13,7 @@ * @brief XE의 전체 버전 표기 * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 **/ - define('__ZBXE_VERSION__', '1.4.0.4'); + define('__ZBXE_VERSION__', '1.4.0.5'); /** * @brief zbXE가 설치된 장소의 base path를 구함