diff --git a/codepot/src/codepot/controllers/api.php b/codepot/src/codepot/controllers/api.php index 9d3017c1..c168479e 100644 --- a/codepot/src/codepot/controllers/api.php +++ b/codepot/src/codepot/controllers/api.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('code', CODEPOT_LANG); } diff --git a/codepot/src/codepot/controllers/file.php b/codepot/src/codepot/controllers/file.php index 7f20ae45..3ae0c7e0 100644 --- a/codepot/src/codepot/controllers/file.php +++ b/codepot/src/codepot/controllers/file.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('file', CODEPOT_LANG); } diff --git a/codepot/src/codepot/controllers/graph.php b/codepot/src/codepot/controllers/graph.php index f4c88968..82240d72 100644 --- a/codepot/src/codepot/controllers/graph.php +++ b/codepot/src/codepot/controllers/graph.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('code', CODEPOT_LANG); } diff --git a/codepot/src/codepot/controllers/issue.php b/codepot/src/codepot/controllers/issue.php index e7ecd34d..50268873 100644 --- a/codepot/src/codepot/controllers/issue.php +++ b/codepot/src/codepot/controllers/issue.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->load->library ('IssueHelper', 'issuehelper'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('issue', CODEPOT_LANG); diff --git a/codepot/src/codepot/controllers/main.php b/codepot/src/codepot/controllers/main.php index 57bfd468..2fb3b1aa 100644 --- a/codepot/src/codepot/controllers/main.php +++ b/codepot/src/codepot/controllers/main.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); } @@ -35,7 +34,7 @@ class Main extends Controller } else { - $settings = $this->users->fetchSettings($user_name); + $settings = $this->users->fetchSettings ($user_name); if ($settings !== FALSE) $this->login->setUserSettings ($settings); print 'ok'; } diff --git a/codepot/src/codepot/controllers/project.php b/codepot/src/codepot/controllers/project.php index 70cfeeb9..2ce2cb5d 100644 --- a/codepot/src/codepot/controllers/project.php +++ b/codepot/src/codepot/controllers/project.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('project', CODEPOT_LANG); diff --git a/codepot/src/codepot/controllers/site.php b/codepot/src/codepot/controllers/site.php index c5ec398a..d9a1317d 100644 --- a/codepot/src/codepot/controllers/site.php +++ b/codepot/src/codepot/controllers/site.php @@ -1,6 +1,6 @@ load->library ('WikiHelper', 'wikihelper'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('site', CODEPOT_LANG); diff --git a/codepot/src/codepot/controllers/user.php b/codepot/src/codepot/controllers/user.php index b10ec712..3070ddff 100644 --- a/codepot/src/codepot/controllers/user.php +++ b/codepot/src/codepot/controllers/user.php @@ -1,6 +1,6 @@ load->library ('Converter', 'converter'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('user', CODEPOT_LANG); } diff --git a/codepot/src/codepot/controllers/wiki.php b/codepot/src/codepot/controllers/wiki.php index 76c87150..0a8de96b 100644 --- a/codepot/src/codepot/controllers/wiki.php +++ b/codepot/src/codepot/controllers/wiki.php @@ -1,6 +1,6 @@ load->library ('WikiHelper', 'wikihelper'); $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - $this->load->library ('Language', 'lang'); $this->lang->load ('common', CODEPOT_LANG); $this->lang->load ('wiki', CODEPOT_LANG); } diff --git a/codepot/src/codepot/models/codemodel.php b/codepot/src/codepot/models/codemodel.php index ccdcdeb1..fbe71fe6 100644 --- a/codepot/src/codepot/models/codemodel.php +++ b/codepot/src/codepot/models/codemodel.php @@ -1,6 +1,6 @@ load->model('SubversionModel'); -class ProjectModel extends Model +class ProjectModel extends CI_Model { function __construct () { diff --git a/codepot/src/codepot/models/sitemodel.php b/codepot/src/codepot/models/sitemodel.php index c709dd6d..1422e338 100644 --- a/codepot/src/codepot/models/sitemodel.php +++ b/codepot/src/codepot/models/sitemodel.php @@ -1,6 +1,6 @@