Database name change.

And testing the new windows git client.
tomshaw · May 26, 2012 · 63162c1 · 63162c1
1 parent 9eb569f
commit 63162c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/application/configs/application.sample.ini b/application/configs/application.sample.ini
@@ -25,7 +25,7 @@ resources.db.params.profiler.enabled = true
 resources.db.params.host = 127.0.0.1
 resources.db.params.username = root
 resources.db.params.password = password
-resources.db.params.dbname = project_world
+resources.db.params.dbname = db_world
 
 [staging : production]
 

diff --git a/library/Gridola/Grid.php b/library/Gridola/Grid.php
@@ -370,8 +370,7 @@ protected function initView()
             ->setMassActions($this->getMassActions())
             ->setMassActionField($this->getMassactionField())
             ->setExport($this->getExport())
-            ->setToken($this->getToken()->setSalt($this->getDataGridName())
-            ->setTimeout(120))
+            ->setToken($this->getToken()->setSalt($this->getDataGridName())->setTimeout(120))
             ->setFormId($this->getFormId())
             ->setTableClass($this->getTableClass())
             ->setJsonActions($this->encodeMassactions()->getMassActions())