--- a/web/lib/Zend/Controller/Action/Helper/AjaxContext.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Controller/Action/Helper/AjaxContext.php Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
* @category Zend
* @package Zend_Controller
* @subpackage Zend_Controller_Action_Helper
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: AjaxContext.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: AjaxContext.php 24593 2012-01-05 20:35:02Z matthew $
*/
/**
@@ -32,7 +32,7 @@
* @category Zend
* @package Zend_Controller
* @subpackage Zend_Controller_Action_Helper
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_Helper_ContextSwitch
@@ -68,7 +68,10 @@
{
$this->_currentContext = null;
- if (!$this->getRequest()->isXmlHttpRequest()) {
+ $request = $this->getRequest();
+ if (!method_exists($request, 'isXmlHttpRequest') ||
+ !$this->getRequest()->isXmlHttpRequest())
+ {
return;
}