diff options
| author | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
|---|---|---|
| committer | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
| commit | 6949f95f6e21980f36095490bf38fc8a172dbc0f (patch) | |
| tree | b3141f390acd0051396cda6a3da51c1f98384cca /system/libraries/Xmlrpcs.php | |
| parent | 68a02a01a086bbb1b8128ea2744439de84873d11 (diff) | |
| parent | 81f036753272391360ba5b64e6dd93c4101a8733 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
system/helpers/form_helper.php
Diffstat (limited to 'system/libraries/Xmlrpcs.php')
| -rw-r--r-- | system/libraries/Xmlrpcs.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index d263d789d..e8e06d756 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -384,17 +384,13 @@ class CI_Xmlrpcs extends CI_Xmlrpc { { return call_user_func(array($this, $method_parts[1]), $m); } + elseif ($this->object === FALSE) + { + return get_instance()->$method_parts[1]($m); + } else { - if ($this->object === FALSE) - { - $CI =& get_instance(); - return $CI->$method_parts[1]($m); - } - else - { - return $this->object->$method_parts[1]($m); - } + return $this->object->$method_parts[1]($m); } } else |