Skip to content

Commit 8dfa23a

Browse files
Merge pull request chriskacerguis#553 from softwarespot/rename-ci
Renamed _CI variable
2 parents 5e7de16 + d10a309 commit 8dfa23a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

application/libraries/Format.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Format {
5656
*
5757
* @var object
5858
*/
59-
private $_ci;
59+
private $_CI;
6060

6161
/**
6262
* Data to parse
@@ -83,10 +83,10 @@ class Format {
8383
public function __construct($data = NULL, $from_type = NULL)
8484
{
8585
// Get the CodeIgniter reference
86-
$this->_ci = &get_instance();
86+
$this->_CI = &get_instance();
8787

8888
// Load the inflector helper
89-
$this->_ci->load->helper('inflector');
89+
$this->_CI->load->helper('inflector');
9090

9191
// If the provided data is already formatted we should probably convert it to an array
9292
if ($from_type !== NULL)
@@ -283,20 +283,20 @@ public function to_html($data = NULL)
283283
}
284284

285285
// Load the table library
286-
$this->_ci->load->library('table');
286+
$this->_CI->load->library('table');
287287

288-
$this->_ci->table->set_heading($headings);
288+
$this->_CI->table->set_heading($headings);
289289

290290
foreach ($data as $row)
291291
{
292-
// Suppressing the "array to string conversion" notice.
293-
// Keep the "evil" @ here.
294-
$row = @ array_map('strval', $row);
292+
// Suppressing the "array to string conversion" notice
293+
// Keep the "evil" @ here
294+
$row = @array_map('strval', $row);
295295

296-
$this->_ci->table->add_row($row);
296+
$this->_CI->table->add_row($row);
297297
}
298298

299-
return $this->_ci->table->generate();
299+
return $this->_CI->table->generate();
300300
}
301301

302302
/**
@@ -405,7 +405,7 @@ public function to_json($data = NULL)
405405
}
406406

407407
// Get the callback parameter (if set)
408-
$callback = $this->_ci->input->get('callback');
408+
$callback = $this->_CI->input->get('callback');
409409

410410
if (empty($callback) === TRUE)
411411
{

0 commit comments

Comments
 (0)