diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-02 16:17:29 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-02 16:17:29 +0200 |
| commit | 9e0be2ba2179a93200d16a72c74e2ac61f9a71d4 (patch) | |
| tree | 69a0b447980c260ee40d53714ad58036ada8da1a /system/libraries | |
| parent | b75faa1a03a32330e412f0bd0332fb9fa389e914 (diff) | |
| parent | ee04a913dfd78d394a0e09f01655df0870369512 (diff) | |
Merge upstream
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Javascript.php | 2 | ||||
| -rw-r--r-- | system/libraries/Pagination.php | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index 629a3adfe..dd2df697c 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -723,7 +723,7 @@ class CI_Javascript { { if (is_object($result)) { - $json_result = $result->result_array(); + $json_result = is_callable(array($result, 'result_array')) ? $result->result_array() : (array) $result; } elseif (is_array($result)) { diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 0fe73d69f..3d2911813 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -94,17 +94,16 @@ class CI_Pagination { { foreach ($params as $key => $val) { - if (isset($this->$key)) + if ($key === 'anchor_class') + { + $this->anchor_class = ($val != '') ? 'class="'.$val.'" ' : ''; + } + elseif (isset($this->$key)) { $this->$key = $val; } } } - - if ($this->anchor_class != '') - { - $this->anchor_class = 'class="'.$this->anchor_class.'" '; - } } // -------------------------------------------------------------------- |