copy trunk and tag(1.4.0.5)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7287 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-02-06 14:50:11 +00:00
commit 5d07b5cc47
3 changed files with 3 additions and 2 deletions

View file

@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기
* 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야
**/
define('__ZBXE_VERSION__', '1.4.0.4');
define('__ZBXE_VERSION__', '1.4.0.5');
/**
* @brief zbXE가 설치된 장소의 base path를 구함

View file

@ -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");
}

View file

@ -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;
}