Added Object(), fixed some ajax handling

2013-10-03 16:51:13 +10:00
parent d3627ace8f
commit 9e191ab0be
3 changed files with 34 additions and 2 deletions
--- a/classes/lnApp/Controller/TemplateDefault.php
+++ b/classes/lnApp/Controller/TemplateDefault.php
@@ -97,8 +97,9 @@ abstract class lnApp_Controller_TemplateDefault extends Kohana_Controller_Templa
 			return;

 		// For AJAX calls, we dont need to render the complete page.
-		if ($this->request->is_ajax()) {
+		if ($this->request->is_ajax() OR (Kohana::$config->load('debug')->ajax AND preg_match('/^ajax/',Request::current()->action()))) {
 			$this->auto_render = FALSE;
+
 			return;
 		}