summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.hgflow8
-rw-r--r--system/database/drivers/postgre/postgre_driver.php18
-rw-r--r--user_guide/changelog.html2
-rw-r--r--user_guide/general/security.html8
4 files changed, 29 insertions, 7 deletions
diff --git a/.hgflow b/.hgflow
new file mode 100644
index 000000000..ad6e56e0f
--- /dev/null
+++ b/.hgflow
@@ -0,0 +1,8 @@
+[Basic]
+develop = develop
+feature = feature/
+version_tag =
+publish = default
+release = release/
+hotfix = hotfix/
+
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index bf985de37..43d4d4d28 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -554,6 +554,24 @@ class CI_DB_postgre_driver extends CI_DB {
// --------------------------------------------------------------------
/**
+ * Insert_batch statement
+ *
+ * Generates a platform-specific insert string from the supplied data
+ *
+ * @access public
+ * @param string the table name
+ * @param array the insert keys
+ * @param array the insert values
+ * @return string
+ */
+ function _insert_batch($table, $keys, $values)
+ {
+ return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values);
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Update statement
*
* Generates a platform-specific update string from the supplied data
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 8469a599e..945fafb65 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -73,6 +73,8 @@ Change Log
<li>Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.</li>
<li>Removed internal usage of the <samp>EXT</samp> constant.</li>
<li>Visual updates to the welcome_message view file and default error templates. Thanks to <a href="https://bitbucket.org/danijelb">danijelb</a> for the pull request.</li>
+ <li>Added <samp>insert_batch()</samp> function to the PostgreSQL database driver. Thanks to epallerols for the patch.</li>
+
</ul>
</li>
<li>Helpers
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index bcbb36c6f..31dd7978c 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -76,15 +76,9 @@ minimize the possibility that malicious data can be passed to your application.
<li>Dash: -</li>
</ul>
-<h2>GET, POST, and COOKIE Data</h2>
-
-<p>GET data is simply disallowed by CodeIgniter since the system utilizes URI segments rather than traditional URL query strings (unless
-you have the query string option enabled in your config file). The global GET
-array is <strong>unset</strong> by the Input class during system initialization.</p>
-
<h2>Register_globals</h2>
-<p>During system initialization all global variables are unset, except those found in the $_POST and $_COOKIE arrays. The unsetting
+<p>During system initialization all global variables are unset, except those found in the $_GET, $_POST, and $_COOKIE arrays. The unsetting
routine is effectively the same as register_globals = off.</p>
<a name="error_reporting"></a>