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

Merge branch 'master' of github.com:thelia/thelia

Browse Source 
Conflicts:
	composer.lock
This commit is contained in:
Manuel Raynaud
2013-05-16 19:07:34 +02:00
parent 97817d6885 20d1655c9d
commit 5afc54096a
11 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -32,7 +32,7 @@
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"": "local/plugins/", "": "local/modules/",
"Thelia" : "core/lib/" "Thelia" : "core/lib/"
} }
}, },

2
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "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" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "d0aa87e405dbeb21f65d8d8321b7cca7", "hash": "fed0f90bca039760e3021c1febd59371",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",

2
core/bootstrap.php
View File

@@ -7,7 +7,7 @@
*/ */
define('THELIA_ROOT', realpath(__DIR__ .'/../') . "/"); define('THELIA_ROOT', realpath(__DIR__ .'/../') . "/");
define('THELIA_CONF_DIR', THELIA_ROOT . '/local/config'); define('THELIA_CONF_DIR', THELIA_ROOT . '/local/config');
define('THELIA_PLUGIN_DIR', THELIA_ROOT . '/local/plugins'); define('THELIA_MODULE_DIR', THELIA_ROOT . '/local/modules');
define('THELIA_TEMPLATE_DIR', THELIA_ROOT . 'templates/'); define('THELIA_TEMPLATE_DIR', THELIA_ROOT . 'templates/');
$loader = require __DIR__ . "/vendor/autoload.php"; $loader = require __DIR__ . "/vendor/autoload.php";

2
core/lib/Thelia/Core/Thelia.php
View File

@@ -122,7 +122,7 @@ class Thelia extends Kernel
foreach ($modules as $module) { foreach ($modules as $module) {
try { try {
$loader = new XmlFileLoader($container, new FileLocator(THELIA_PLUGIN_DIR . "/" . ucfirst($module->getCode()) . "/Config")); $loader = new XmlFileLoader($container, new FileLocator(THELIA_MODULE_DIR . "/" . ucfirst($module->getCode()) . "/Config"));
$loader->load("config.xml"); $loader->load("config.xml");
} catch(\InvalidArgumentException $e) { } catch(\InvalidArgumentException $e) {

4
install/thelia.sql
View File

@@ -40,7 +40,7 @@ CREATE TABLE `product`
`ecotax` FLOAT, `ecotax` FLOAT,
`newness` TINYINT DEFAULT 0, `newness` TINYINT DEFAULT 0,
`promo` TINYINT DEFAULT 0, `promo` TINYINT DEFAULT 0,
`stock` INTEGER DEFAULT 0, `quantity` INTEGER DEFAULT 0,
`visible` TINYINT DEFAULT 0 NOT NULL, `visible` TINYINT DEFAULT 0 NOT NULL,
`weight` FLOAT, `weight` FLOAT,
`position` INTEGER NOT NULL, `position` INTEGER NOT NULL,
@@ -1748,7 +1748,7 @@ CREATE TABLE `product_version`
`ecotax` FLOAT, `ecotax` FLOAT,
`newness` TINYINT DEFAULT 0, `newness` TINYINT DEFAULT 0,
`promo` TINYINT DEFAULT 0, `promo` TINYINT DEFAULT 0,
`stock` INTEGER DEFAULT 0, `quantity` INTEGER DEFAULT 0,
`visible` TINYINT DEFAULT 0 NOT NULL, `visible` TINYINT DEFAULT 0 NOT NULL,
`weight` FLOAT, `weight` FLOAT,
`position` INTEGER NOT NULL, `position` INTEGER NOT NULL,

0
local/plugins/.gitkeep → local/modules/.gitkeep
View File

0
local/plugins/Test/Config/config.xml → local/modules/Test/Config/config.xml
View File

0
local/plugins/Test/Loop/Doobitch.php → local/modules/Test/Loop/Doobitch.php
View File

0
local/plugins/Test/Loop/Foo.php → local/modules/Test/Loop/Foo.php
View File

0
local/plugins/Test/TestLoop/Equal.php → local/modules/Test/TestLoop/Equal.php
View File

2
templates/default/index.html
View File

@@ -6,7 +6,7 @@
</head> </head>
<body> <body>
<div>TODO write content<br /> <div>TODO write content<br />
<THELIA_cat type="category"> <THELIA_cat type="category">
#__COUNT__ - #TITLE <br /> #__COUNT__ - #TITLE <br />
nb child : #NB_CHILD <br /><br /> nb child : #NB_CHILD <br /><br />
</THELIA_cat> </THELIA_cat>