diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-11 16:15:07 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-11 16:15:07 +0100 |
| commit | a49c8adbc24d904b3473cc301f0f56818acdddcb (patch) | |
| tree | 2529ab952a74f1b1686e27544be283a833830809 | |
| parent | 05983fcb5b8f04fb895c025e28ef6ffc44a5f602 (diff) | |
Change CI_Table:: to NULL
Because semantics
| -rw-r--r-- | system/libraries/Table.php | 12 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/table.rst | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 58016e9b8..1a3aa9a2b 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -93,7 +93,7 @@ class CI_Table { * * @var function */ - public $function = FALSE; + public $function = NULL; /** * Set the template from the table config file if it exists @@ -138,10 +138,10 @@ class CI_Table { * * Can be passed as an array or discreet params * - * @param mixed + * @param mixed $array * @return CI_Table */ - public function set_heading($args = array()) + public function set_heading($args = array(), $attributes = array()) { $args = func_get_args(); $this->heading = $this->_prep_args($args); @@ -316,9 +316,9 @@ class CI_Table { $this->_compile_template(); // Validate a possibly existing custom cell manipulation function - if ($this->function !== FALSE && ! is_callable($this->function)) + if (isset($this->function) && ! is_callable($this->function)) { - $this->function = FALSE; + $this->function = NULL; } // Build the table! @@ -391,7 +391,7 @@ class CI_Table { { $out .= $this->empty_cells; } - elseif ($this->function !== FALSE) + elseif (isset($this->function)) { $out .= call_user_func($this->function, $cell); } diff --git a/user_guide_src/source/libraries/table.rst b/user_guide_src/source/libraries/table.rst index 6e011083e..9d95eddfc 100644 --- a/user_guide_src/source/libraries/table.rst +++ b/user_guide_src/source/libraries/table.rst @@ -139,7 +139,7 @@ Class Reference .. class:: CI_Table - .. attribute:: $function = FALSE + .. attribute:: $function = NULL Allows you to specify a native PHP function or a valid function array object to be applied to all cell data. :: |