karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of disposed.de:scattport

Browse Source 
Conflicts:
	application/config/autoload.php
	application/views/header.php
This commit is contained in:
Karsten Heiken
2011-09-07 17:04:46 +02:00
parent c651655bd7 b5e65d229f
commit 208d4bf873
38 changed files with 1524 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/config/autoload.php
View File

@@ -1,4 +1,4 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
<?php defined('BASEPATH') || exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| AUTO-LOADER
@@ -64,7 +64,7 @@ $autoload['libraries'] = array('session', 'lang_detect', 'database', 'access', '
| $autoload['helper'] = array('url', 'file');
*/
$autoload['helper'] = array('date', 'url', 'html', 'language', 'hash', 'text');
$autoload['helper'] = array('date', 'url', 'form', 'language', 'hash', 'asset', 'text');
/*