From 4b6c5afe35bba8544b7d984e334368644f1b995c Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Tue, 19 Jun 2007 07:52:32 +0000
Subject: [PATCH] Adding loadPluginModels back to dispatcher until I fix issue
 with loading associated plugin models. Corrected form.ctp template parse
 error

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5294 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/console/libs/templates/views/form.ctp | 2 +-
 cake/dispatcher.php                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cake/console/libs/templates/views/form.ctp b/cake/console/libs/templates/views/form.ctp
index 97fe43ed2..2c17ce5c2 100644
--- a/cake/console/libs/templates/views/form.ctp
+++ b/cake/console/libs/templates/views/form.ctp
@@ -27,7 +27,7 @@
 <div class="<?php echo $singularVar;?>">
 <?php echo "<?php echo \$form->create('{$modelClass}');?>\n";?>
 	<fieldset>
- 		<legend><?php echo "<?php __('".Inflector::humanize($action).", true);?> <?php __('{$singularHumanName}');?>";?></legend>
+ 		<legend><?php echo "<?php __('".Inflector::humanize($action)."', true);?> <?php __('{$singularHumanName}');?>";?></legend>
 <?php
 		echo "\t<?php\n";
 		foreach($fields as $field) {
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 626eb47db..f2efc71c4 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -127,6 +127,7 @@ class Dispatcher extends Object {
 			$oldAction = $params['action'];
 			$params = $this->_restructureParams($params);
 			$this->plugin = $plugin;
+			loadPluginModels($plugin);
 			$this->base = $this->base.'/'.Inflector::underscore($ctrlName);
 
 			if(empty($params['controller']) || !class_exists($pluginClass)) {