summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--demos/controls/protected/application.xml2
-rw-r--r--demos/personal/protected/application.xml2
-rw-r--r--framework/Exceptions/TErrorHandler.php1
-rw-r--r--framework/Exceptions/TException.php2
4 files changed, 6 insertions, 1 deletions
diff --git a/demos/controls/protected/application.xml b/demos/controls/protected/application.xml
index 6f8b11bc..50375cc6 100644
--- a/demos/controls/protected/application.xml
+++ b/demos/controls/protected/application.xml
@@ -7,7 +7,9 @@
</paths>
<!-- modules configured and loaded for all services -->
<modules>
+ <!--
<module id="cache" type="System.Data.TSqliteCache" DbFile="Demo.cache"/>
+ -->
<module id="session" type="THttpSession" />
</modules>
<services>
diff --git a/demos/personal/protected/application.xml b/demos/personal/protected/application.xml
index ef7240b9..111cbc7a 100644
--- a/demos/personal/protected/application.xml
+++ b/demos/personal/protected/application.xml
@@ -22,7 +22,9 @@
</module>
<!-- auth manager module -->
<module id="auth" type="System.Security.TAuthManager" UserManager="users" LoginPage="login" />
+ <!--
<module id="data" type="Application.Modules.DataModule" DbFile="Application.Data.Site" />
+ -->
</modules>
</service>
</services>
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 592ba615..8af92ecc 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -153,6 +153,7 @@ class TErrorHandler extends TComponent implements IModule
$handling=true;
if(($response=Prado::getApplication()->getResponse())!==null)
$response->clear();
+ header('Content-Type: text/html; charset=UTF-8');
if($param instanceof THttpException)
$this->handleExternalError($param->getStatusCode(),$param);
else if(Prado::getApplication()->getMode()==='Debug')
diff --git a/framework/Exceptions/TException.php b/framework/Exceptions/TException.php
index a4cd6f60..fb668458 100644
--- a/framework/Exceptions/TException.php
+++ b/framework/Exceptions/TException.php
@@ -159,7 +159,7 @@ class THttpException extends TException
{
$args=func_get_args();
array_shift($args);
- call_user_func_array(array('parent', '__construct'), $args);
+ call_user_func_array(array('TException', '__construct'), $args);
$this->_statusCode=TPropertyValue::ensureInteger($statusCode);
}