@@ 914-931 (lines=18) @@ | ||
911 | } |
|
912 | ||
913 | // Safety: Was the class already loaded by a previous call? |
|
914 | if (in_array($subclass, $this->_ci_loaded_files)) |
|
915 | { |
|
916 | // Before we deem this to be a duplicate request, let's see |
|
917 | // if a custom object name is being supplied. If so, we'll |
|
918 | // return a new instance of the object |
|
919 | if ( ! is_null($object_name)) |
|
920 | { |
|
921 | $CI = & get_instance(); |
|
922 | if ( ! isset($CI->$object_name)) |
|
923 | { |
|
924 | return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name); |
|
925 | } |
|
926 | } |
|
927 | ||
928 | $is_duplicate = TRUE; |
|
929 | log_message('debug', $class." class already loaded. Second attempt ignored."); |
|
930 | return; |
|
931 | } |
|
932 | ||
933 | include_once($baseclass); |
|
934 | include_once($subclass); |
|
@@ 953-970 (lines=18) @@ | ||
950 | } |
|
951 | ||
952 | // Safety: Was the class already loaded by a previous call? |
|
953 | if (in_array($filepath, $this->_ci_loaded_files)) |
|
954 | { |
|
955 | // Before we deem this to be a duplicate request, let's see |
|
956 | // if a custom object name is being supplied. If so, we'll |
|
957 | // return a new instance of the object |
|
958 | if ( ! is_null($object_name)) |
|
959 | { |
|
960 | $CI = & get_instance(); |
|
961 | if ( ! isset($CI->$object_name)) |
|
962 | { |
|
963 | return $this->_ci_init_class($class, '', $params, $object_name); |
|
964 | } |
|
965 | } |
|
966 | ||
967 | $is_duplicate = TRUE; |
|
968 | log_message('debug', $class." class already loaded. Second attempt ignored."); |
|
969 | return; |
|
970 | } |
|
971 | ||
972 | include_once($filepath); |
|
973 | $this->_ci_loaded_files[] = $filepath; |