*** limesurvey206plus-build151018_orig/application/extensions/ExtendedClientScript/ExtendedClientScript.php 2015-10-19 02:52:38.000000000 +0900 --- limesurvey206plus-build151018/application/extensions/ExtendedClientScript/ExtendedClientScript.php 2015-11-05 09:55:58.565082210 +0900 *************** *** 201,209 **** */ private function combineAndCompress($type, $urls, $pos) { ! $this->fileUrl or $this->fileUrl = $this->getCoreScriptUrl(); ! $this->basePath or $this->basePath = realpath($_SERVER['DOCUMENT_ROOT']); ! $this->filePath or $this->filePath = $this->basePath.$this->fileUrl; $optionsHash = ($type == 'js') ? md5($this->basePath . $this->compressJs . $this->ttlDays . $this->prefix) : md5($this->basePath . $this->compressCss . $this->ttlDays . $this->prefix . serialize($this->cssMinFilters) . serialize($this->cssMinPlugins)); --- 201,209 ---- */ private function combineAndCompress($type, $urls, $pos) { ! $this->fileUrl or $this->fileUrl = $this->getCoreScriptUrl(); ! $this->basePath or $this->basePath = ROOT; ! $this->filePath or $this->filePath = $this->basePath.DIRECTORY_SEPARATOR.substr($this->fileUrl, strlen($_SERVER['CONTEXT_PREFIX'])); $optionsHash = ($type == 'js') ? md5($this->basePath . $this->compressJs . $this->ttlDays . $this->prefix) : md5($this->basePath . $this->compressCss . $this->ttlDays . $this->prefix . serialize($this->cssMinFilters) . serialize($this->cssMinPlugins)); *************** *** 228,234 **** $fileName = $this->prefix.md5($combineHash.$optionsHash.$this->_changesHash).".$type"; ! $this->_renewFile = (file_exists($this->filePath.'/'.$fileName)) ? false : true; if ($this->_renewFile) { --- 228,234 ---- $fileName = $this->prefix.md5($combineHash.$optionsHash.$this->_changesHash).".$type"; ! $this->_renewFile = (file_exists($this->filePath.DIRECTORY_SEPARATOR.$fileName)) ? false : true; if ($this->_renewFile) { *************** *** 236,242 **** $combinedFile = ''; foreach ($urls as $key => $file) ! $combinedFile .= file_get_contents($this->basePath.'/'.$file); if ($type == 'js' && $this->compressJs) $combinedFile = $this->minifyJs($combinedFile); --- 236,242 ---- $combinedFile = ''; foreach ($urls as $key => $file) ! $combinedFile .= file_get_contents($this->basePath.substr($file, strlen($_SERVER['CONTEXT_PREFIX']))); if ($type == 'js' && $this->compressJs) $combinedFile = $this->minifyJs($combinedFile); *************** *** 244,250 **** if ($type == 'css' && $this->compressCss) $combinedFile = $this->minifyCss($combinedFile); ! file_put_contents($this->filePath.'/'.$fileName, $combinedFile); } foreach ($urls as $url) --- 244,250 ---- if ($type == 'css' && $this->compressCss) $combinedFile = $this->minifyCss($combinedFile); ! file_put_contents($this->filePath.DIRECTORY_SEPARATOR.$fileName, $combinedFile); } foreach ($urls as $url)