Permalink
Browse files

Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter int…

…o develop
  • Loading branch information...
2 parents 5335a68 + 0f22117 commit 301928536b2f2e6abbe0dc8c6031ab296f7b3ecf @jcc2010 committed Apr 15, 2012
View
14 system/core/Output.php
@@ -43,37 +43,37 @@ class CI_Output {
*
* @var string
*/
- protected $final_output;
+ public $final_output;
/**
* Cache expiration time
*
* @var int
*/
- protected $cache_expiration = 0;
+ public $cache_expiration = 0;
/**
* List of server headers
*
* @var array
*/
- protected $headers = array();
+ public $headers = array();
/**
* List of mime types
*
* @var array
*/
- protected $mime_types = array();
+ public $mime_types = array();
/**
* Determines wether profiler is enabled
*
* @var book
*/
- protected $enable_profiler = FALSE;
+ public $enable_profiler = FALSE;
/**
* Determines if output compression is enabled
*
* @var bool
*/
- protected $_zlib_oc = FALSE;
+ protected $_zlib_oc = FALSE;
/**
* List of profiler sections
*
@@ -85,7 +85,7 @@ class CI_Output {
*
* @var bool
*/
- protected $parse_exec_vars = TRUE;
+ public $parse_exec_vars = TRUE;
public function __construct()
{
View
2 system/database/DB_result.php
@@ -384,7 +384,7 @@ public function num_fields() { return 0; }
public function list_fields() { return array(); }
public function field_data() { return array(); }
public function free_result() { $this->result_id = FALSE; }
- protected function _data_seek() { return TRUE; }
+ protected function _data_seek() { return FALSE; }
protected function _fetch_assoc() { return array(); }
protected function _fetch_object() { return array(); }
View
2 system/database/drivers/cubrid/cubrid_result.php
@@ -163,7 +163,7 @@ public function free_result()
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{
View
17 system/database/drivers/interbase/interbase_result.php
@@ -131,23 +131,6 @@ public function free_result()
// --------------------------------------------------------------------
/**
- * Data Seek
- *
- * Moves the internal pointer to the desired offset. We call
- * this internally before fetching results to make sure the
- * result set starts at zero
- *
- * @return array
- */
- protected function _data_seek($n = 0)
- {
- // Interbase driver doesn't implement a suitable function
- return FALSE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Result - associative array
*
* Returns the result set as an array
View
4 system/database/drivers/mssql/mssql_result.php
@@ -126,11 +126,11 @@ public function free_result()
/**
* Data Seek
*
- * Moves the internal pointer to the desired offset. We call
+ * Moves the internal pointer to the desired offset. We call
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{
View
2 system/database/drivers/mysql/mysql_result.php
@@ -128,7 +128,7 @@ public function free_result()
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{
View
4 system/database/drivers/mysqli/mysqli_result.php
@@ -125,11 +125,11 @@ public function free_result()
/**
* Data Seek
*
- * Moves the internal pointer to the desired offset. We call
+ * Moves the internal pointer to the desired offset. We call
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{
View
4 system/database/drivers/oci8/oci8_result.php
@@ -244,8 +244,6 @@ public function result_array()
$this->row_data[$row_index++] = $row;
}
- // Un-comment the following line, in case it becomes needed
- // $this->_data_seek();
return $this->result_array = $this->row_data;
}
@@ -299,8 +297,6 @@ public function result_object()
$this->result_object[$row_index++] = $row;
}
- // Un-comment the following line, in case it becomes needed
- // $this->_data_seek();
return $this->result_object;
}
View
16 system/database/drivers/odbc/odbc_result.php
@@ -140,22 +140,6 @@ public function free_result()
// --------------------------------------------------------------------
/**
- * Data Seek
- *
- * Moves the internal pointer to the desired offset. We call
- * this internally before fetching results to make sure the
- * result set starts at zero
- *
- * @return bool
- */
- protected function _data_seek($n = 0)
- {
- return FALSE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Result - associative array
*
* Returns the result set as an array
View
17 system/database/drivers/pdo/pdo_result.php
@@ -92,7 +92,6 @@ public function result_assoc()
$res_handler = 'result_'.$type;
$this->$res_handler = array();
- $this->_data_seek(0);
while ($row = $this->$res_method())
{
@@ -228,22 +227,6 @@ public function free_result()
// --------------------------------------------------------------------
/**
- * Data Seek
- *
- * Moves the internal pointer to the desired offset. We call
- * this internally before fetching results to make sure the
- * result set starts at zero
- *
- * @return bool
- */
- protected function _data_seek($n = 0)
- {
- return FALSE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Result - associative array
*
* Returns the result set as an array
View
2 system/database/drivers/postgre/postgre_result.php
@@ -128,7 +128,7 @@ public function free_result()
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{
View
2 system/database/drivers/sqlite/sqlite_result.php
@@ -112,7 +112,7 @@ public function field_data()
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{
View
4 system/database/drivers/sqlite3/sqlite3_result.php
@@ -198,8 +198,6 @@ public function result_array()
$this->row_data[$row_index++] = $row;
}
- // Un-comment the following line, in case it becomes needed
- // $this->_data_seek();
return $this->result_array = $this->row_data;
}
@@ -266,8 +264,6 @@ public function result_object()
$this->num_rows = count($this->result_object);
}
- // Un-comment the following line, in case it becomes needed
- // $this->_data_seek();
return $this->result_object;
}
View
16 system/database/drivers/sqlsrv/sqlsrv_result.php
@@ -124,22 +124,6 @@ public function free_result()
// --------------------------------------------------------------------
/**
- * Data Seek
- *
- * Moves the internal pointer to the desired offset. We call
- * this internally before fetching results to make sure the
- * result set starts at zero
- *
- * @return void
- */
- protected function _data_seek($n = 0)
- {
- // Not implemented
- }
-
- // --------------------------------------------------------------------
-
- /**
* Result - associative array
*
* Returns the result set as an array
View
2 user_guide_src/source/changelog.rst
@@ -210,7 +210,7 @@ Bug fixes for 3.0
Version 2.1.1
=============
-Release Date: November 14, 2011
+Release Date: Not Released
- General Changes
- Fixed support for docx, xlsx files in mimes.php.

0 comments on commit 3019285

Please sign in to comment.