@@ -171,7 +171,7 @@ if (!isset($id) and isset($options["where"]["id"])) $id = $options["where"]["id"]; - $cache = (is_numeric($id) and isset(self::$caches[$model_name][$id])) ? + $cache = (is_numeric($id) and isset(self::$caches[$model_name][$id])) ? self::$caches[$model_name][$id] : ((isset($options["read_from"]["id"]) and isset(self::$caches[$model_name][$options["read_from"]["id"]])) ? self::$caches[$model_name][$options["read_from"]["id"]] : @@ -266,7 +266,7 @@ $model->queryString = $query->queryString; if (isset($model->updated_at)) - $model->updated = !empty($model->updated_at); + $model->updated = (!empty($model->updated_at) and $model->updated_at != "0000-00-00 00:00:00"); $clone = clone $model; includes/class/Model.php @@ -838,7 +838,7 @@ $last = null; $args = func_get_args(); foreach ($args as $index => $arg) { - if (!isset($arg) or (is_string($arg) and trim($arg) === "") or $arg === array() or (is_object($arg) and empty($arg))) + if (!isset($arg) or (is_string($arg) and trim($arg) === "") or $arg === array() or (is_object($arg) and empty($arg)) or ($arg === "0000-00-00 00:00:00")) $last = $arg; else return $arg; @@ -1022,7 +1022,7 @@ function uploaded($file, $url = true) { if (empty($file)) return ""; - + $config = Config::current(); return ($url ? $config->chyrp_url.$config->uploads_path.$file : MAIN_DIR.$config->uploads_path.$file); } includes/helpers.php a30e0a79b41baaa85ea1b8b2acf7f06dcd5b7aca Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/54167dbcb1c5fe4da5073838b4b202d170dfcf7e 54167dbcb1c5fe4da5073838b4b202d170dfcf7e 2009-09-13T16:52:32-07:00 2009-09-13T16:52:32-07:00 Fixed models with updated_at as "0000-00-00 00:00:00" having ->updated = true. afca32b970320008154b348dfe7aa662904e516a Alex Suraci i.am@toogeneric.com