Merge branch 'master' of disposed.de:scattport

This commit is contained in:
Karsten Heiken
2011-08-08 14:26:04 +02:00
49 changed files with 507 additions and 265 deletions

View File

@@ -27,7 +27,7 @@
*
* @author Karsten Heiken <karsten@disposed.de>
*/
class Trials extends CI_Controller {
class Trials extends MY_Controller {
/**
* Constructor.
@@ -37,9 +37,6 @@ class Trials extends CI_Controller {
$this->load->model('trial');
$this->load->model('program');
$this->load->model('project');
// load language file
// $this->lang->load(strtolower($this->router->class));
}
/**