Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index 9fa69f4..dd8ffad 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -215,12 +215,9 @@
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 5f02761..def5a57 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,8 +75,9 @@
<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 dd935eb..0afe0eb 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -84,7 +84,7 @@
<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 @@
<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 @@
<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>