File: phpbb/template/asset.php
Unmodified
Added
Modified
Removed
Line 152 | Line 152 |
---|
*/ public function set_path($path, $urlencode = false) {
|
*/ public function set_path($path, $urlencode = false) {
|
| // Since 1.7.0 Twig returns the real path of the file. We need it to be relative to the working directory. $real_root_path = realpath($this->path_helper->get_phpbb_root_path()) . DIRECTORY_SEPARATOR;
// If the asset is under the phpBB root path we need to remove its path and then prepend $phpbb_root_path if (substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) { $path = $this->path_helper->get_phpbb_root_path() . str_replace('\\', '/', substr($path, strlen($real_root_path))); } else { // Else we make the path relative to the current working directory $real_root_path = realpath('.') . DIRECTORY_SEPARATOR; if ($real_root_path && substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) { $path = str_replace('\\', '/', substr($path, strlen($real_root_path))); } }
|
if ($urlencode) { $paths = explode('/', $path);
| if ($urlencode) { $paths = explode('/', $path);
|
Line 161 | Line 179 |
---|
} $path = implode('/', $paths); }
|
} $path = implode('/', $paths); }
|
|
|
$this->components['path'] = $path; }
| $this->components['path'] = $path; }
|