summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-02-07 11:54:44 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-02-07 11:54:44 +0100
commit287763b919d2f1522cf4e6e39c0d33a957ff0538 (patch)
treedc7fdf1e16f5952557e6084b470077730a0a179e
parent58e8caf2afb3ea054f83999fb0698720a1a58738 (diff)
parent01d1a5b936556f3b19786b7407cce11cf3bdb616 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
-rw-r--r--index.php7
-rw-r--r--user_guide/changelog.html9
2 files changed, 16 insertions, 0 deletions
diff --git a/index.php b/index.php
index 918c80259..74e3ba32a 100644
--- a/index.php
+++ b/index.php
@@ -130,6 +130,13 @@
* Resolve the system path for increased reliability
* ---------------------------------------------------------------
*/
+
+ // Set the current directory correctly for CLI requests
+ if (defined('STDIN'))
+ {
+ chdir(dirname(__FILE__));
+ }
+
if (realpath($system_path) !== FALSE)
{
$system_path = realpath($system_path).'/';
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 35187efda..09a2cefce 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -59,6 +59,15 @@ Change Log
<p>The <img src="images/reactor-bullet.png" width="16" height="16" alt="Reactor Marker" /> indicates items that were contributed to CodeIgniter via CodeIgniter Reactor.</p>
+<h2>Version 2.0.1</h2>
+<p>Release Date: n/a<br />
+Hg Tag: n/a</p>
+
+<h3>Bug fixes for 2.0.1</h3>
+<ul>
+ <li class="reactor">CLI requests can now be run from any folder, not just when CD'ed next to index.php.</li>
+</ul>
+
<h2>Version 2.0.0</h2>
<p>Release Date: January 28, 2011<br />
Hg Tag: v2.0.0</p>