Sat Jul 15 17:15:02 PHT 2006 Nimrod A. Abing * Resolve conflicts introduced by CakePHP-v-1.1.6.3264. diff -rN -u old-cake/cake/libs/controller/controller.php new-cake/cake/libs/controller/controller.php --- old-cake/cake/libs/controller/controller.php 2006-07-15 17:17:35.000000000 +0800 +++ new-cake/cake/libs/controller/controller.php 2006-07-15 17:17:35.000000000 +0800 @@ -253,7 +253,11 @@ $component = new Component(); $component->init($this); } - parent::__construct(); + if (!empty($this->hiddenMethods)) { + $this->hiddenMethods = array_unique(array_merge($this->hiddenMethods, get_class_methods('Controller'))); + } else { + $this->hiddenMethods = get_class_methods('Controller'); + } } /** * Hide method names from dispatcher, preventing them from being accessed using