summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/Exceptions/messages.txt2
-rw-r--r--framework/Web/THttpRequest.php2
-rw-r--r--framework/Web/UI/TControl.php2
-rw-r--r--framework/Web/UI/TTemplateControl.php2
4 files changed, 5 insertions, 3 deletions
diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages.txt
index 803271e5..da022afe 100644
--- a/framework/Exceptions/messages.txt
+++ b/framework/Exceptions/messages.txt
@@ -55,6 +55,8 @@ httprequest_separator_invalid = THttpRequest.UrlParamSeparator can only contai
httprequest_urlmanager_inexist = THttpRequest.UrlManager '{0}' does not point to an existing module.
httprequest_urlmanager_invalid = THttpRequest.UrlManager '{0}' must point to a module extending from TUrlManager.
+httpcookiecollection_httpcookie_required = THttpCookieCollection can only accept THttpCookie objects.
+
httpresponse_bufferoutput_unchangeable = THttpResponse.BufferOutput cannot be modified after THttpResponse is initialized.
httpresponse_file_inexistent = THttpResponse cannot send file '{0}'. The file does not exist.
diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index 6ae95ab3..ef0660cc 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -828,7 +828,7 @@ class THttpCookieCollection extends TList
$this->_o->addCookie($item);
}
else
- throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+ throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
}
/**
diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 987b5665..cd24de41 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -112,7 +112,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
* Indexes for the rare fields.
* In order to save memory, rare fields will only be created if they are needed.
*/
- const RF_CONTROLS=0; // cihld controls
+ const RF_CONTROLS=0; // child controls
const RF_CHILD_STATE=1; // child state field
const RF_NAMED_CONTROLS=2; // list of controls whose namingcontainer is this control
const RF_NAMED_CONTROLS_ID=3; // counter for automatic id
diff --git a/framework/Web/UI/TTemplateControl.php b/framework/Web/UI/TTemplateControl.php
index c8ccaea8..0ebe933e 100644
--- a/framework/Web/UI/TTemplateControl.php
+++ b/framework/Web/UI/TTemplateControl.php
@@ -124,7 +124,7 @@ class TTemplateControl extends TCompositeControl
/**
* Creates child controls.
- * This method is overriden to load and instantiate control template.
+ * This method is overridden to load and instantiate control template.
* This method should only be used by framework and control developers.
*/
public function createChildControls()