[joomla#28967] Save & Close of Menu Item results in Fatal Error

realityking · dextercowley · commit 95e663d54f95 · 2012-08-22T17:38:45.000-07:00
diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -26,6 +26,9 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+22-Aug-2012 Mark Dexter
+ # [#28967] Save & Close of Menu Item results in Fatal Error
+
 21-Aug-2012 Jean-Marie Simonet
  # [#28954] *Administrator templates positions untranslated when editing Module position
 
diff --git a/libraries/joomla/archive/tar.php b/libraries/joomla/archive/tar.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
+jimport('joomla.filesystem.folder');
+
 /**
  * Tar format adapter for the JArchive class
  *
diff --git a/libraries/joomla/archive/zip.php b/libraries/joomla/archive/zip.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
+jimport('joomla.filesystem.folder');
+
 /**
  * ZIP format adapter for the JArchive class
  *
diff --git a/libraries/joomla/installer/adapters/component.php b/libraries/joomla/installer/adapters/component.php
@@ -10,6 +10,7 @@
 defined('JPATH_PLATFORM') or die;
 
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * Component installer
diff --git a/libraries/joomla/installer/adapters/file.php b/libraries/joomla/installer/adapters/file.php
@@ -11,6 +11,7 @@
 
 jimport('joomla.installer.filemanifest');
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * File installer
diff --git a/libraries/joomla/installer/adapters/language.php b/libraries/joomla/installer/adapters/language.php
@@ -10,6 +10,7 @@
 defined('JPATH_PLATFORM') or die;
 
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * Language installer
diff --git a/libraries/joomla/installer/adapters/library.php b/libraries/joomla/installer/adapters/library.php
@@ -11,6 +11,7 @@
 
 jimport('joomla.installer.librarymanifest');
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * Library installer
diff --git a/libraries/joomla/installer/adapters/module.php b/libraries/joomla/installer/adapters/module.php
@@ -10,6 +10,7 @@
 defined('JPATH_PLATFORM') or die;
 
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * Module installer
diff --git a/libraries/joomla/installer/adapters/package.php b/libraries/joomla/installer/adapters/package.php
@@ -11,6 +11,7 @@
 
 jimport('joomla.base.adapterinstance');
 jimport('joomla.installer.packagemanifest');
+jimport('joomla.filesystem.folder');
 
 /**
  * Package installer
diff --git a/libraries/joomla/installer/adapters/plugin.php b/libraries/joomla/installer/adapters/plugin.php
@@ -10,6 +10,7 @@
 defined('JPATH_PLATFORM') or die;
 
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * Plugin installer
diff --git a/libraries/joomla/installer/adapters/template.php b/libraries/joomla/installer/adapters/template.php
@@ -11,6 +11,7 @@
 
 jimport('joomla.installer.extension');
 jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
 
 /**
  * Template installer
diff --git a/libraries/legacy/table/menu.php b/libraries/legacy/table/menu.php
@@ -111,7 +111,7 @@ public function check()
 		}
 
 		// Verify that a first level menu item alias is not the name of a folder.
-		jimport('joomla.filesystem.folders');
+		jimport('joomla.filesystem.folder');
 		if ($this->parent_id == 1 && in_array($this->alias, JFolder::folders(JPATH_ROOT)))
 		{
 			$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_FOLDER', $this->alias, $this->alias));

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`defined('JPATH_PLATFORM') or die;`
`11`	`11`
	`12`	`+jimport('joomla.filesystem.folder');`
	`13`	`+`
`12`	`14`	`/**`
`13`	`15`	`* Tar format adapter for the JArchive class`
`14`	`16`	`*`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function check()`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// Verify that a first level menu item alias is not the name of a folder.`
`114`		`- jimport('joomla.filesystem.folders');`
	`114`	`+ jimport('joomla.filesystem.folder');`
`115`	`115`	`if ($this->parent_id == 1 && in_array($this->alias, JFolder::folders(JPATH_ROOT)))`
`116`	`116`	`{`
`117`	`117`	`$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_FOLDER', $this->alias, $this->alias));`