dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// merge problem

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-10-16 15:08:39 +02:00
1 parent dfd00bb064
commit e493305c47
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
classes/Autoload.php
+2 -3
View File
@@ -83,8 +83,7 @@ class Autoload
return; return;
// regenerate the class index if the requested file doesn't exists // regenerate the class index if the requested file doesn't exists
if (!isset($this->index[$classname]) if ((isset($this->index[$classname]) && $this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
|| ($this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
|| (isset($this->index[$classname.'Core']) && $this->index[$classname.'Core'] && !is_file($this->root_dir.$this->index[$classname.'Core']))) || (isset($this->index[$classname.'Core']) && $this->index[$classname.'Core'] && !is_file($this->root_dir.$this->index[$classname.'Core'])))
$this->generateIndex(); $this->generateIndex();
@@ -139,7 +138,7 @@ class Autoload
else else
{ {
$filename_tmp = tempnam(dirname($filename), basename($filename.'.')); $filename_tmp = tempnam(dirname($filename), basename($filename.'.'));
if ($filename_tmp !== false AND file_put_contents($filename_tmp, $content, LOCK_EX) !== false) if ($filename_tmp !== false && file_put_contents($filename_tmp, $content, LOCK_EX) !== false)
{ {
if (!@rename($filename_tmp, $filename)) if (!@rename($filename_tmp, $filename))
unlink($filename_tmp); unlink($filename_tmp);