This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Unit_test.php 2012-01-15 14:38:43.686677712 +0900 | |
+++ CIU_Unit_test.php 2012-01-15 14:38:37.982511889 +0900 | |
@@ -141,39 +141,82 @@ | |
} | |
$CI =& get_instance(); | |
- $CI->load->language('unit_test'); | |
+ | |
$this->_parse_template(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Common.php 2012-01-15 13:23:40.383705408 +0900 | |
+++ CIU_Common.php 2012-01-15 13:25:05.311691412 +0900 | |
@@ -134,7 +134,8 @@ | |
// Look for the class first in the native system/libraries folder | |
// thenin the local application/libraries folder | |
- foreach (array(BASEPATH, APPPATH) as $path) | |
+ // then in the ciunit/core folder | |
+ foreach (array(BASEPATH, APPPATH, CIUPATH) as $path) | |
{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- CodeIgniter.php 2012-01-15 12:58:49.833556996 +0900 | |
+++ CIU_CodeIgniter.php 2012-01-15 13:03:41.436502460 +0900 | |
@@ -46,6 +46,7 @@ | |
* Load the global functions | |
* ------------------------------------------------------ | |
*/ | |
+ require(CIUPATH.'core/Common.php'); | |
require(BASEPATH.'core/Common.php'); | |
/* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Output.php 2012-01-15 11:41:19.910816096 +0900 | |
+++ CIU_Output.php 2012-01-15 12:56:39.893667597 +0900 | |
@@ -55,6 +55,10 @@ | |
$this->mime_types = $mimes; | |
log_message('debug', "Output Class Initialized"); | |
+ | |
+ $this->final_output = ''; //would be just set to 'null' in CI_Output | |
+ $this->_ci_ob_level = ob_get_level(); | |
+ $this->cookies = array(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Loader.php 2012-01-15 11:38:44.690500680 +0900 | |
+++ CIU_Loader.php 2012-01-15 14:35:56.229809919 +0900 | |
@@ -338,7 +338,14 @@ | |
*/ | |
public function view($view, $vars = array(), $return = FALSE) | |
{ | |
- return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return)); | |
+ if ($return === TRUE) | |
+ { | |
+ return parent::view($view, $vars, $return); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
# FuelPHP Install Script | |
# | |
# @author Kenji Suzuki https://github.com/kenjis | |
# @copyright 2011 Kenji Suzuki | |
# @license MIT License http://www.opensource.org/licenses/mit-license.php | |
if [ $# -lt 2 ]; then | |
echo "Install FuelPHP and Create Application Repository" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/user_guide/changelog.html b/user_guide/changelog.html | |
index 11a1537..167616e 100644 | |
--- a/user_guide/changelog.html | |
+++ b/user_guide/changelog.html | |
@@ -58,13 +58,14 @@ Change Log | |
<h1>Change Log</h1> | |
<h2>Version 2.1.0</h2> | |
-<p>Release Date: November 01, 2011</p> | |
+<p>Release Date: November 14, 2011</p> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/** | |
* DbTestCase | |
* | |
* @package Fuel | |
* @author Kenji Suzuki | |
* @copyright 2011 Kenji Suzuki | |
* @link https://github.com/kenjis | |
*/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
namespace Fuel\Tasks; | |
use Fuel\Core\Cli; | |
use Fuel\Core\DB; | |
use Fuel\Core\DBUtil; | |
use Fuel\Core\Format; | |
/** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/user_guide/changelog.html b/user_guide/changelog.html | |
index c02a55b..35946a2 100644 | |
--- a/user_guide/changelog.html | |
+++ b/user_guide/changelog.html | |
@@ -28,7 +28,7 @@ | |
<div id="masthead"> | |
<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> | |
<tr> | |
-<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td> | |
+<td><h1>CodeIgniter User Guide Version 2.1.0</h1></td> |