r8189 적용 후 로그인이 안되는 문제 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8190 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-03-16 06:14:06 +00:00
parent 8b64a98058
commit c706e33901
2 changed files with 18 additions and 14 deletions

View file

@ -550,8 +550,12 @@ class Context {
function getResponseMethod() {
$self = ($this instanceof Context)?$this:Context::getInstance();
if($self->response_method) return $self->response_method;
$method = $self->getRequestMethod();
$methods = array('HTML','XMLRPC','JSON');
return in_array($self->response_method, $method)?$self->response_method:$methods[0];
return in_array($method, $methods)?$method:$methods[0];
}
/**
@ -977,8 +981,8 @@ class Context {
$self = ($this instanceof Context)?$this:Context::getInstance();
$avail_types = array('head', 'body');
if(!in_array($type, $avail_types)) $type = $avail_types[0];
if(strpos($file,'://')===false && $file{0}!='/' && $file{0}!='.') $file = './'.$file;
$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
while(strpos($file,'/../')) $file = preg_replace('/\/([^\/]+)\/\.\.\//s','/',$file,1);
@ -1274,4 +1278,4 @@ class Context {
return $path;
}
}
?>
?>