deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to work with KH 3.3

Browse Source
This commit is contained in:
Deon George
2012-11-26 16:57:18 +11:00
parent 5bd1841571
commit fc2ffd7bad
97 changed files with 5459 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/bootstrap.php
View File

@@ -114,7 +114,7 @@ Kohana::modules(array(
'cron' => SMDPATH.'cron', // Kohana Cron Module
// 'codebench' => SMDPATH.'codebench', // Benchmarking tool
'database' => SMDPATH.'database', // Database access
'gchart' => MODPATH.'gchart', // Google Chart Module
// 'gchart' => MODPATH.'gchart', // Google Chart Module
// 'image' => SMDPATH.'image', // Image manipulation
'khemail' => SMDPATH.'khemail', // Email module for Kohana 3 PHP Framework
'minion' => SMDPATH.'minion', // CLI Tasks
@@ -155,7 +155,7 @@ Route::set('default', '(<controller>(/<action>(/<id>)))', array('id'=>'[a-zA-Z0-
/**
* If APC is enabled, and we need to clear the cache
*/
if (file_exists(APPPATH.'cache/CLEAR_APC_CACHE') AND function_exists('apc_clear_cache') AND ! Kohana::$is_cli) {
if (file_exists(APPPATH.'cache/CLEAR_APC_CACHE') AND function_exists('apc_clear_cache') AND (PHP_SAPI !== 'cli')) {
if (! apc_clear_cache() OR ! unlink(APPPATH.'cache/CLEAR_APC_CACHE'))
throw new Kohana_Exception('Unable to clear the APC cache.');
}