diff options
| author | Preetham <me@preetham.in> | 2014-12-05 17:13:57 +0100 |
|---|---|---|
| committer | Preetham <me@preetham.in> | 2014-12-05 17:13:57 +0100 |
| commit | be7e493fd7a4dcc8f00b60201d4948f3618d9b6a (patch) | |
| tree | 91f29e5f7f2b98527f3815b3235e268627c676d7 | |
| parent | e29136567e2a12726f9ab40762bcb47a7cde759c (diff) | |
Removed img_name from captcha helper
Signed-off-by: Preetham <me@preetham.in>
| -rw-r--r-- | system/helpers/captcha_helper.php | 3 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/helpers/captcha_helper.rst | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php index a105b344b..373b1af9d 100644 --- a/system/helpers/captcha_helper.php +++ b/system/helpers/captcha_helper.php @@ -73,7 +73,6 @@ if ( ! function_exists('create_captcha')) 'word_length' => 8, 'font_size' => 16, 'img_id' => '', - 'img_name' => '', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', 'colors' => array( 'background' => array(255,255,255), @@ -246,7 +245,7 @@ if ( ! function_exists('create_captcha')) return FALSE; } - $img = '<img id="'.$img_id.'" name="'.$img_name.'" src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />'; + $img = '<img '.($img_id === ''? NULL: 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />'; ImageDestroy($im); return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3dc87b555..5dc36502e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -135,7 +135,7 @@ Release Date: Not Released - Added *filename* to the returned array elements. - Updated to use `imagepng()` in case that `imagejpeg()` isn't available. - Added **font_size** option to allow customization of font size. - - Added **img_id** and **img_name** options to set id and name attributes of captcha image. + - Added **img_id** option to set id attribute of captcha image. - :doc:`Text Helper <helpers/text_helper>` changes include: diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 7d7f30de8..6e0cfc979 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -35,7 +35,6 @@ Once loaded you can generate a CAPTCHA like this:: 'word_length' => 8, 'font_size' => 16, 'img_id' => 'Image id', - 'img_name' => 'Image name', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid @@ -64,7 +63,6 @@ Once loaded you can generate a CAPTCHA like this:: - **word_length** defaults to 8, **pool** defaults to '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. - The **img_id** will be set as the "id" of the captcha image. -- The **img_name** will be set as the "name" of the captcha image. - If any of the **colors** values is missing, it will be replaced by the default. Adding a Database |