diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-07 18:14:12 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-07 18:14:12 +0200 |
| commit | 770c8677207be0a9091456b8d763bfd0e5456606 (patch) | |
| tree | f9cd1d88c105ede5a977e4d4abfea8716c4a531b | |
| parent | 018af7a82749cb5c6d224940ab5f08d801f54988 (diff) | |
| parent | ec36dc8001f315fda9bfb37d283493ce5c34da57 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
| -rw-r--r-- | system/helpers/string_helper.php | 9 | ||||
| -rw-r--r-- | user_guide/changelog.html | 3 | ||||
| -rw-r--r-- | user_guide/helpers/form_helper.html | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 9fa69f46c..dd8ffaddb 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -215,12 +215,9 @@ if ( ! function_exists('random_string')) case 'nozero' : $pool = '123456789'; break; } - - $str = ''; - for ($i=0; $i < $len; $i++) - { - $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); - } + + $str = substr(str_shuffle(str_repeat($pool, ceil($len/strlen($pool)))),0,$len); + return $str; break; case 'unique' : diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5f0276137..def5a5788 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,8 +75,9 @@ Change Log <li>Helpers <ul> <li>Added <samp>increment_string()</samp> to <a href="helpers/string_helper.html">String Helper</a> to turn "foo" into "foo-1" or "foo-1" into "foo-2".</li> - <li>Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)</li> + <li>Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)</li> <li><samp>url_title()</samp> will now trim extra dashes from beginning and end.</li> + <li>Improved speed of <a href="helpers/string_helper.html">String Helper</a>'s <b>random_string()</b> method</li> </ul> </li> <li>Database diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index dd935ebd9..0afe0eb53 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -84,7 +84,7 @@ in the event your URLs ever change.</p> <p>The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:</p> -<code><form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send" /></code> +<code><form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" /></code> <h4>Adding Attributes</h4> @@ -97,7 +97,7 @@ echo form_open('email/send', $attributes);</code> <p>The above example would create a form similar to this:</p> -<code><form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send" class="email" id="myform" /></code> +<code><form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" class="email" id="myform" /></code> <h4>Adding Hidden Input Fields</h4> @@ -110,7 +110,7 @@ echo form_open('email/send', '', $hidden);</code> <p>The above example would create a form similar to this:</p> -<code><form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send"><br /> +<code><form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send"><br /> <input type="hidden" name="username" value="Joe" /><br /> <input type="hidden" name="member_id" value="234" /></code> |