Browse files

Fixed conflicts.

  • Loading branch information...
1 parent 99f6c8c commit fe1d45a023b08753f4c5f1d908d54ae842277558 Phil Sturgeon committed Aug 13, 2011
Showing with 3 additions and 2 deletions.
  1. +1 −1 system/core/Input.php
  2. +1 −1 system/core/URI.php
  3. +1 −0 user_guide/changelog.html
@@ -672,7 +672,7 @@ public function is_ajax_request()
public function is_cli_request()
- return (bool) defined('STDIN');
+ return (php_sapi_name() == 'cli') or defined('STDIN');
@@ -62,7 +62,7 @@ function _fetch_uri_string()
if (strtoupper($this->config->item('uri_protocol')) == 'AUTO')
// Is the request coming from the command line?
- if (defined('STDIN'))
+ if (php_sapi_name() == 'cli' or defined('STDIN'))
@@ -105,6 +105,7 @@ <h3>Bug fixes for 2.0.3</h3>
<li class="reactor">Fixed a bug where the method <kbd>$this->cart->total_items()</kbd> from <a href="libraries/cart.html">Cart Library</a> now returns the sum of the quantity of all items in the cart instead of your total count.</li>
<li class="reactor">Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.</li>
<li class="reactor">Fixed a bug where using <kbd>$this->db->select_max()</kdb>, <kbd>$this->db->select_min()</kdb>, etc could throw notices. Thanks to w43l for the patch.</li>
+ <li class="reactor">Replace checks for STDIN with php_sapi_name() == 'cli' which on the whole is more reliable. This should get parameters in crontab working.</li>
<h2>Version 2.0.2</h2>

0 comments on commit fe1d45a

Please sign in to comment.