diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-11-07 14:44:04 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-11-07 14:44:04 +0100 |
| commit | 0bb08b7a7ab11b4cf655110a5bd17cf7fc61accb (patch) | |
| tree | 12fa32405e975561cb2f932845b7742c65898ccd /user_guide_src/source/helpers | |
| parent | 0ef93646615516ae2bc87e54894708adaa29700f (diff) | |
| parent | 44aa1ab0655283b67d6fdcb081803f25453dbc73 (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'user_guide_src/source/helpers')
| -rw-r--r-- | user_guide_src/source/helpers/captcha_helper.rst | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index bdf33c2a1..a1c13c5c8 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -132,9 +132,9 @@ The following functions are available: .. php:function:: create_captcha([$data = ''[, $img_path = ''[, $img_url = ''[, $font_path = '']]]]) :param array $data: Array of data for the CAPTCHA - :param string $img_path: Path to create the image in - :param string $img_url: URL to the CAPTCHA image folder - :param string $font_path: Server path to font + :param string $img_path: Path to create the image in (DEPRECATED) + :param string $img_url: URL to the CAPTCHA image folder (DEPRECATED) + :param string $font_path: Server path to font (DEPRECATED) :returns: array('word' => $word, 'time' => $now, 'image' => $img) :rtype: array @@ -159,3 +159,7 @@ The following functions are available: The **word** is the word that appears in the captcha image, which if not supplied to the function, will be a random string. + + .. note:: Usage of the ``$img_path``, ``$img_url`` and ``$font_path`` + parameters is DEPRECATED. Provide them in the ``$data`` array + instead. |