Change current version to 5.1

ornicar · Apr 30, 2010 · 98b91f0 · 98b91f0
1 parent 9c9e6e5
commit 98b91f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/apps/front/modules/branch/actions/components.class.php b/apps/front/modules/branch/actions/components.class.php
@@ -28,15 +28,19 @@ public function executeShow()
     ->withI18n()
     ->leftJoin('p.Doc d')
     ->where('d.type = ?', 'tuto')
+    ->andWhere('d.branch_id = ?', $this->branch->id)
     ->orderBy('p.position ASC')
     ->fetchOne();
     $this->howTo = dmDb::query('Doc d')
     ->withI18n()
     ->where('d.type = ?', 'howto')
+    ->andWhere('d.branch_id = ?', $this->branch->id)
     ->fetchOne();
     $this->openSourceProjects = dmDb::query('DocPage p')
     ->withI18n()
+    ->leftJoin('p.Doc d')
     ->where('pTranslation.name = ?', 'Open source projects')
+    ->andWhere('d.branch_id = ?', $this->branch->id)
     ->fetchOne();
   }
 

diff --git a/config/app.yml b/config/app.yml
@@ -1,4 +1,4 @@
 all:
 
   branches:
-    current:      "5.0"
+    current:      "5.1"