TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
This commit is contained in:
Etienne Roudeix
2013-08-21 09:19:56 +02:00
parent 6a14bef3de a0b82879f5
commit 86b11096ba
3275 changed files with 929970 additions and 274940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
documentation/api/files/Log/TlogDestinationConfig.php.txt Normal file → Executable file
View File

@@ -24,7 +24,6 @@
namespace Thelia\Log;
use Thelia\Model\Config;
use Thelia\Model\ConfigDesc;
use Thelia\Model\ConfigQuery;
class TlogDestinationConfig
@@ -51,11 +50,9 @@ class TlogDestinationConfig
$this->load();
}
public function load()
{
if (null === $config = ConfigQuery::create()->findOneByName($this->name))
{
if (null === $config = ConfigQuery::create()->findOneByName($this->name)) {
$config = new Config();
$config->setName($this->name);
$config->setValue($this->default);
@@ -63,7 +60,7 @@ class TlogDestinationConfig
$config->setSecured(1);
$config->save();
}
$this->value = $config->getValue();
}
}