@@ -36,6 +36,8 @@ Keeping Chyrp up to date is important to make sure that your blog is as safe and 4. Overwrite your current Chyrp installation files with the new ones. 5. Restore your config files¹ back to /includes/. 6. Upgrade by navigating to [upgrade.php](), and restore any backups. +7. Re-enable your Modules/Feathers. +8. Run the upgrader again. It will run the Module/Feather upgrade tasks. ¹ The config files vary depending on what you're upgrading from. Any of these in are considered "config files": @@ -92,4 +94,4 @@ Chyrp is multilingual! If your first language isn't English, you can apply a new 1. Download and unzip the localization. 1. Upload the `.mo` file to the `includes/locale/` folder. You don't need anything else for the translation to work. 1. Open your web browser and navigate to your Chyrp administration panel. -1. Click on the *Settings* tab, and change the *Language* option to the language you just uploaded. \ No newline at end of file +1. Click on the *Settings* tab, and change the *Language* option to the language you just uploaded. README.markdown @@ -31,35 +31,49 @@ * @mixed@ */ public function __get($name) { - if (isset($this->$name)) - return $this->$name; - else { - $model_name = get_class($this); - $placeholders = (isset($this->__placeholders) and $this->__placeholders); - - Trigger::current()->filter($filtered, $model_name."_".$name."_attr", $this); - if ($filtered !== false) - $this->$name = $filtered; - - $this->belongs_to = (array) $this->belongs_to; - $this->has_many = (array) $this->has_many; - $this->has_one = (array) $this->has_one; - if (in_array($name, $this->belongs_to) or isset($this->belongs_to[$name])) { - $class = (isset($this->belongs_to[$name])) ? $this->belongs_to[$name] : $name ; - return $this->$name = new $class($this->{$name."_id"}); - } elseif (in_array($name, $this->has_many) or isset($this->has_many[$name])) { - if (isset($this->has_many[$name])) - list($class, $by) = $this->has_many[$name]; - else - list($class, $by) = array(depluralize($name), $model_name); - - return $this->$name = call_user_func(array($class, "find"), - array("where" => array(strtolower($by)."_id" => $this->id), - "placeholders" => $placeholders)); - } elseif (in_array($name, $this->has_one)) { - $class = depluralize($name); - return $this->$name = new $class(null, array("where" => array(strtolower($model_name)."_id" => $this->id))); + $model_name = get_class($this); + $placeholders = (isset($this->__placeholders) and $this->__placeholders); + + Trigger::current()->filter($filtered, $model_name."_".$name."_attr", $this); + if ($filtered !== false) + $this->$name = $filtered; + + $this->belongs_to = (array) $this->belongs_to; + $this->has_many = (array) $this->has_many; + $this->has_one = (array) $this->has_one; + if (in_array($name, $this->belongs_to) or isset($this->belongs_to[$name])) { + $class = (isset($this->belongs_to[$name])) ? $this->belongs_to[$name] : $name ; + if (isset($this->belongs_to[$name])) { + $opts =& $this->belongs_to[$name]; + $model = oneof(@$opts["model"], $name); + $match = oneof(@$opts["by"], strtolower($name)); + $where = array_merge(array("id" => $this->{$match."_id"}), + (array) @$opts["where"]); + } else { + $model = $name; + $where = array("id" => $this->{$name."_id"}); + } + + return $this->$name = new $model(null, array("where" => $where)); + } elseif (in_array($name, $this->has_many) or isset($this->has_many[$name])) { + if (isset($this->has_many[$name])) { + $opts =& $this->has_many[$name]; + $model = oneof($opts["model"], $name); + $match = oneof(@$opts["by"], strtolower($name)); + $where = array_merge(array($match."_id" => $this->id), + (array) @$opts["where"]); + } else { + $model = depluralize($name); + $match = $model_name; + $where = array(strtolower($match)."_id" => $this->id); } + + return $this->$name = call_user_func(array($model, "find"), + array("where" => $where, + "placeholders" => $placeholders)); + } elseif (in_array($name, $this->has_one)) { + $class = depluralize($name); + return $this->$name = new $class(null, array("where" => array(strtolower($model_name)."_id" => $this->id))); } } @@ -109,6 +123,9 @@ if ($model_name == "visitor") $model_name = "user"; + if (!isset($id) and isset($options["where"]["id"])) + $id = $options["where"]["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"]])) ? includes/class/Model.php @@ -95,7 +95,7 @@ else $call = false; - if ($call === false and method_exists($this->controller, $method)) + if ($call != "override" and method_exists($this->controller, $method)) $response = call_user_func_array(array($this->controller, $method), $args); else $response = false; includes/class/Route.php @@ -40,7 +40,7 @@ $args = func_get_args(); $args[0] = $call; if ($index + 1 == count($name)) - return $return == $this->exists($call) ? call_user_func_array(array($this, "call"), $args) : $return ; + return $this->exists($call) ? call_user_func_array(array($this, "call"), $args) : $return ; else $return = $this->exists($call) ? call_user_func_array(array($this, "call"), $args) : $return ; } @@ -52,7 +52,7 @@ $arguments = func_get_args(); array_shift($arguments); - $return = false; + $return = null; $this->called[$name] = array(); if (isset($this->priorities[$name])) { # Predefined priorities? includes/class/Trigger.php @@ -9,7 +9,7 @@ class Page extends Model { public $belongs_to = array("user", "parent" => array("model" => "page")); - public $has_many = array("children" => array("page", "parent")); + public $has_many = array("children" => array("model" => "page", "by" => "parent")); /** * Function: __construct includes/model/Page.php @@ -626,7 +626,7 @@ array("COUNT(post_id) AS total", "post_id"), null, null, - null, + array(), null, null, "post_id"); @@ -645,7 +645,7 @@ array("MAX(created_at) AS latest", "post_id"), null, null, - null, + array(), null, null, "post_id"); modules/comments/comments.php ad0af46a4d2b7b5ec8a63f3ac2962de14b6a0339 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp-site/commit/fc6d342a56651dae8a93077187963df9f57361fc fc6d342a56651dae8a93077187963df9f57361fc 2008-11-20T19:35:51-08:00 2008-11-20T19:35:51-08:00 * Greatly increased model has_many/belongs_to flexibility. * Updated the README. * Fixed a logic error in Trigger calls. * For a trigger call to override a Controller's call, they should return "override". * If $id is not set in a model grab but it's in the "where" option, that'll be used so we can keep the caching. 19af6b3cb233353dabb0515c097e881e5a05825f Alex Suraci i.am@toogeneric.com