Merge branch '1.9.1' into devel
This commit is contained in:
commit
959a239118
|
@ -443,7 +443,7 @@ class Application_Model_StoredFile {
|
||||||
$serverName = $_SERVER['SERVER_NAME'];
|
$serverName = $_SERVER['SERVER_NAME'];
|
||||||
$serverPort = $_SERVER['SERVER_PORT'];
|
$serverPort = $_SERVER['SERVER_PORT'];
|
||||||
|
|
||||||
return constructGetFileUrl($serverName, $serverPort);
|
return $this->constructGetFileUrl($serverName, $serverPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -456,7 +456,7 @@ class Application_Model_StoredFile {
|
||||||
$serverName = $CC_CONFIG['baseUrl'];
|
$serverName = $CC_CONFIG['baseUrl'];
|
||||||
$serverPort = $CC_CONFIG['basePort'];
|
$serverPort = $CC_CONFIG['basePort'];
|
||||||
|
|
||||||
return constructGetFileUrl($serverName, $serverPort);
|
return $this->constructGetFileUrl($serverName, $serverPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function constructGetFileUrl($p_serverName, $p_serverPort){
|
private function constructGetFileUrl($p_serverName, $p_serverPort){
|
||||||
|
|
Loading…
Reference in New Issue