Deal with the renaming of the old MVC classes and remove the aliases.

joomla · Jul 12, 2012 · 1fae63a · 1fae63a
1 parent 9372a93
commit 1fae63a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 96 deletions.
diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php
@@ -125,14 +125,14 @@ public function batch($model = null)
 	/**
 	 * Function that allows child controller access to model data after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   JModelLegacy  &$model     The data model object.
+	 * @param   array         $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   1.6
 	 */
-	protected function postSaveHook(JModel &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy &$model, $validData = array())
 	{
 		// Initialise variables.
 		$app = JFactory::getApplication();

diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
@@ -241,13 +241,13 @@ protected function getReturnPage()
 	/**
 	 * Function that allows child controller access to model data after the data has been saved.
 	 *
-	 * @param	JModel	$model		The data model object.
-	 * @param	array	$validData	The validated data.
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
 	 *
 	 * @return	void
 	 * @since	1.6
 	 */
-	protected function postSaveHook(JModel &$model, $validData)
+	protected function postSaveHook(JModelLegacy &$model, $validData)
 	{
 		$task = $this->getTask();
 

diff --git a/components/com_weblinks/controllers/weblink.php b/components/com_weblinks/controllers/weblink.php
@@ -195,13 +195,13 @@ protected function getReturnPage()
 	/**
 	 * Function that allows child controller access to model data after the data has been saved.
 	 *
-	 * @param	JModel	$model		The data model object.
-	 * @param	array	$validData	The validated data.
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
 	 *
 	 * @return	void
 	 * @since	1.6
 	 */
-	protected function postSaveHook(JModel &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy &$model, $validData = array())
 	{
 		$task = $this->getTask();
 

diff --git a/libraries/cms/controller/index.html b/libraries/cms/controller/index.html
diff --git a/libraries/cms/controller/legacy.php b/libraries/cms/controller/legacy.php
diff --git a/libraries/cms/model/index.html b/libraries/cms/model/index.html
diff --git a/libraries/cms/model/legacy.php b/libraries/cms/model/legacy.php
diff --git a/libraries/cms/view/index.html b/libraries/cms/view/index.html
diff --git a/libraries/cms/view/legacy.php b/libraries/cms/view/legacy.php