Merge on master
This commit is contained in:
gmorel
2013-09-03 11:02:36 +02:00
parent 6ee99b6cad
commit 19ea6d25df
278 changed files with 261 additions and 4658 deletions

View File

@@ -406,7 +406,7 @@ function createCategory($faker, $parent, $position, &$categoryIdList, $contentId
//add random associated content
$alreadyPicked = array();
for($i=1; $i<rand(0, 3); $i++) {
for ($i=1; $i<rand(0, 3); $i++) {
$categoryAssociatedContent = new Thelia\Model\CategoryAssociatedContent();
do {
$pick = array_rand($contentIdList, 1);