diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-09 12:36:31 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-09 12:36:31 +0200 |
| commit | ea7a866f6107d4b50b4a7059f1373035aa12dd23 (patch) | |
| tree | bf3c2d9f16d098358108f4ad609cf2b068c45ba6 /user_guide_src/source/libraries | |
| parent | 9ac557f2473844f3c2207189f371f827dbaddb71 (diff) | |
| parent | 580fe8ec482f5df7ca5b91e11b13b72a8f3ed0b8 (diff) | |
Merge changes from develop
Diffstat (limited to 'user_guide_src/source/libraries')
| -rw-r--r-- | user_guide_src/source/libraries/form_validation.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/output.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/user_guide_src/source/libraries/form_validation.rst b/user_guide_src/source/libraries/form_validation.rst index 14305b664..22272dc9b 100644 --- a/user_guide_src/source/libraries/form_validation.rst +++ b/user_guide_src/source/libraries/form_validation.rst @@ -399,7 +399,7 @@ The validation system supports callbacks to your own validation functions. This permits you to extend the validation class to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can create a callback function -that does that. Let's create a example of this. +that does that. Let's create an example of this. In your controller, change the "username" rule to this:: diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst index 0472d14cf..3289a241f 100644 --- a/user_guide_src/source/libraries/output.rst +++ b/user_guide_src/source/libraries/output.rst @@ -105,6 +105,9 @@ Permits you to manually set a server status header. Example:: `See here <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_ for a full list of headers. +.. note:: This method is an alias for :doc:`Common function <../general/common_funtions.rst>` + ``set_status_header()``. + $this->output->enable_profiler(); ================================== |