diff --git a/composer.lock b/composer.lock index a6f05615a..2b0e5a88a 100755 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "4f3fabbb795a71df45ae9f6ccb6df355", + "hash": "009aced8b279e1c14558460fff2cc993", "packages": [ { "name": "ensepar/html2pdf", diff --git a/core/lib/Thelia/Core/Template/ParserContext.php b/core/lib/Thelia/Core/Template/ParserContext.php index 9e3fde416..fe069901e 100755 --- a/core/lib/Thelia/Core/Template/ParserContext.php +++ b/core/lib/Thelia/Core/Template/ParserContext.php @@ -23,6 +23,7 @@ namespace Thelia\Core\Template; +use Thelia\Core\Thelia; use Thelia\Model\ConfigQuery; use Thelia\Core\HttpFoundation\Request; use Thelia\Form\BaseForm; @@ -39,7 +40,7 @@ class ParserContext implements \IteratorAggregate public function __construct(Request $request) { // Setup basic variables - $this->set('THELIA_VERSION' , ConfigQuery::read('thelia_version', 'undefined')) + $this->set('THELIA_VERSION' , Thelia::THELIA_VERSION) ; } diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 690e2cd81..1bc1e7649 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -54,9 +54,7 @@ use Propel\Runtime\Connection\ConnectionManagerSingle; class Thelia extends Kernel { - const THELIA_VERSION = 0.1; - - protected $tpexConfig; + const THELIA_VERSION = '2.0.0-beta1'; public function init() { diff --git a/install/insert.sql b/install/insert.sql index 0f1634d6f..63eb5829e 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -32,6 +32,11 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat ('contact_email','', 0, 0, NOW(), NOW()), ('url_site','', 0, 0, NOW(), NOW()), ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW()) +('thelia_version','2.0.0-beta1', 1, 1, NOW(), NOW()) +('thelia_major_version','2', 1, 1, NOW(), NOW()) +('thelia_minus_version','0', 1, 1, NOW(), NOW()) +('thelia_release_version','0', 1, 1, NOW(), NOW()) +('thelia_extra_version','beta1', 1, 1, NOW(), NOW()) ;