diff options
| author | Cory <ckdarby@gmail.com> | 2012-06-06 18:46:40 +0200 |
|---|---|---|
| committer | Cory <ckdarby@gmail.com> | 2012-06-06 18:46:40 +0200 |
| commit | 61fb9c1596ea220a0a8106160c5c68f9343ff9df (patch) | |
| tree | 136126cc057bc58000f020990e32685c89adf399 /user_guide_src/source/general | |
| parent | 037944e6c2083ce82ef5785947fddbf671362006 (diff) | |
| parent | 47b673324f06236264ca64f8c3155aab51762609 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into issue_1374
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'user_guide_src/source/general')
| -rw-r--r-- | user_guide_src/source/general/common_functions.rst | 5 | ||||
| -rw-r--r-- | user_guide_src/source/general/core_classes.rst | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 70563b8d2..99126f900 100644 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -79,3 +79,8 @@ html_escape($mixed) This function provides short cut for htmlspecialchars() function. It accepts string and array. To prevent Cross Site Scripting (XSS), it is very useful. + +get_mimes() +============= + +This function returns the MIMEs array from config/mimes.php.
\ No newline at end of file diff --git a/user_guide_src/source/general/core_classes.rst b/user_guide_src/source/general/core_classes.rst index ac41407f7..4aa6693f7 100644 --- a/user_guide_src/source/general/core_classes.rst +++ b/user_guide_src/source/general/core_classes.rst @@ -31,6 +31,7 @@ time CodeIgniter runs: - Log - Output - Router +- Security - URI - Utf8 |