Permalink
Browse files

Merge pull request #1484 from realityking/imports

Make sure JFolder is imported in files that use it.
  • Loading branch information...
2 parents 1dbe011 + 31650e8 commit 16782d8ee0ecb31ba23257b3742e93cc64d8f2e0 @LouisLandry LouisLandry committed Aug 22, 2012
View
2 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
*
View
2 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
*
View
1 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
View
1 libraries/joomla/installer/adapters/file.php
@@ -11,6 +11,7 @@
jimport('joomla.installer.filemanifest');
jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
/**
* File installer
View
1 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
View
1 libraries/joomla/installer/adapters/library.php
@@ -11,6 +11,7 @@
jimport('joomla.installer.librarymanifest');
jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
/**
* Library installer
View
1 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
View
1 libraries/joomla/installer/adapters/package.php
@@ -11,6 +11,7 @@
jimport('joomla.base.adapterinstance');
jimport('joomla.installer.packagemanifest');
+jimport('joomla.filesystem.folder');
/**
* Package installer
View
1 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
View
1 libraries/joomla/installer/adapters/template.php
@@ -11,6 +11,7 @@
jimport('joomla.installer.extension');
jimport('joomla.base.adapterinstance');
+jimport('joomla.filesystem.folder');
/**
* Template installer
View
2 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));

0 comments on commit 16782d8

Please sign in to comment.