Merge branch 'dev'

application/config/config.php

@@ -86,7 +86,7 @@
 | WARNING: You MUST set this value!
 |
 */
-$config['base_url'] 				= '';
+$config['base_url'] 				= 'http://lavalust-dev.local';
 
 /*
 |--------------------------------------------------------------------------

application/config/database.php

@@ -52,9 +52,9 @@
 */
 
 $database['driver']	= 'mysql';
-$database['hostname']	= '';
-$database['username']	= '';
+$database['hostname']	= 'localhost';
+$database['username']	= 'root';
 $database['password']	= '';
-$database['database']	= '';
+$database['database']	= 'dummy';
 $database['charset']	= 'utf8';
 ?>

application/controllers/Welcome.php

@@ -1,7 +1,7 @@
 <?php
 defined('PREVENT_DIRECT_ACCESS') OR exit('No direct script access allowed');
 
-class Welcome extends Controller{
+class Welcome extends Controller {
 
 	public function index() {
 		$this->load->view('welcome_page');

system/core/Controller.php

@@ -69,7 +69,7 @@ public function model($classes)
 	public function view($viewFile, $data = array())
 	{
 		if(!empty($data))
-			extract($data);
+			extract($data, EXTR_SKIP);
 		ob_start();
 		if(file_exists(APP_DIR .'views/' . $viewFile . '.php'))
 			require_once(APP_DIR .'views/' . $viewFile . '.php');

updates.txt

@@ -0,0 +1,5 @@
+New Updates
+
+1. You can now call $this->load->database inside models, controllers and view so that you can use $this->db directly (see controller.php's database function)
+2.database.php added like and between queries
+3. view function. extract(EXTR_SKIP)