Fixed problem with callback not firing

pull/11/head
Mike Cao 14 years ago
parent b085ecd888
commit c6df2125f6

@ -120,13 +120,15 @@ class Flight {
if (isset(self::$classes[$name])) { if (isset(self::$classes[$name])) {
list($class, $params, $callback) = self::$classes[$name]; list($class, $params, $callback) = self::$classes[$name];
$do_callback = ($callback && (!$shared || !isset(self::$instances[$class])));
$obj = ($shared) ? $obj = ($shared) ?
self::getInstance($class, $params) : self::getInstance($class, $params) :
self::getClass($class, $params); self::getClass($class, $params);
if (!$shared || !isset(self::$instances[$class])) { if ($do_callback) {
$ref = array(&$obj); $ref = array(&$obj);
if ($callback) self::execute($callback, $ref); self::execute($callback, $ref);
} }
return $obj; return $obj;

Loading…
Cancel
Save