summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.project13
-rw-r--r--.settings/com.aptana.formatter.epl.prefs2
-rw-r--r--user_guide/changelog.html2
3 files changed, 16 insertions, 1 deletions
diff --git a/.project b/.project
new file mode 100644
index 000000000..6f00520a1
--- /dev/null
+++ b/.project
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CodeIgniter</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ <nature>com.aptana.projects.webnature</nature>
+ <nature>com.aptana.editor.php.phpNature</nature>
+ </natures>
+</projectDescription>
diff --git a/.settings/com.aptana.formatter.epl.prefs b/.settings/com.aptana.formatter.epl.prefs
new file mode 100644
index 000000000..ebd4b7aeb
--- /dev/null
+++ b/.settings/com.aptana.formatter.epl.prefs
@@ -0,0 +1,2 @@
+com.aptana.formatter.profiles.active=com.aptana.formatter.profiles.default
+eclipse.preferences.version=1
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 38275955b..55fbceeaf 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -85,7 +85,7 @@ Change Log
<li>Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.</li>
<li>Fixed a bug (#538) - Windows paths were ignored when using the <a href="libraries/image_lib.html">Image Manipulation Class</a> to create a new file.</li>
<li>Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.</li>
- <li>Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.</li>
+ <li>Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.</li>
</ul>