hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove baseurl

Browse Source
This commit is contained in:
Romain Neutron
2012-05-23 19:25:27 +02:00
parent 67bab92804
commit b99b01e184
14 changed files with 30 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/databox.class.php
View File

@@ -845,7 +845,7 @@ class databox extends base
return $this;
}
public function setNewStructure(\SplFileInfo $data_template, $path_web, $path_doc, $baseurl)
public function setNewStructure(\SplFileInfo $data_template, $path_web, $path_doc)
{
if ( ! file_exists($data_template->getPathname())) {
throw new \InvalidArgumentException(sprintf('File %s does not exists'));
@@ -853,11 +853,9 @@ class databox extends base
$contents = file_get_contents($data_template->getPathname());
$baseurl = $baseurl ? p4string::addEndSlash($baseurl) : '';
$contents = str_replace(
array("{{dataurl}}", "{{basename}}", "{{datapathweb}}", "{{datapathnoweb}}")
, array($baseurl, $this->dbname, $path_web, $path_doc)
array("{{basename}}", "{{datapathweb}}", "{{datapathnoweb}}")
, array($this->dbname, $path_web, $path_doc)
, $contents
);