Skip to content
This repository has been archived by the owner on Nov 26, 2017. It is now read-only.

Commit

Permalink
Merge pull request #1688 from elkuku/1687
Browse files Browse the repository at this point in the history
Fix incorrect JLog calls (Fix #1687)
  • Loading branch information
eddieajau committed Nov 12, 2012
2 parents de17296 + c9e8df5 commit 21bae80
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions libraries/joomla/filesystem/folder.php
Expand Up @@ -185,7 +185,7 @@ public static function create($path = '', $mode = 0755)

if (($nested > 20) || ($parent == $path))
{
JLog::add('SOME_ERROR_CODE', __METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_LOOP'), JLog::WARNING, 'jerror');
JLog::add(__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_LOOP'), JLog::WARNING, 'jerror');
$nested--;

return false;
Expand Down Expand Up @@ -255,7 +255,7 @@ public static function create($path = '', $mode = 0755)
if ($inBaseDir == false)
{
// Return false for JFolder::create because the path to be created is not in open_basedir
JLog::add('SOME_ERROR_CODE', __METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_PATH'), JLog::WARNING, 'jerror');
JLog::add(__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_PATH'), JLog::WARNING, 'jerror');

return false;
}
Expand All @@ -269,7 +269,6 @@ public static function create($path = '', $mode = 0755)
{
@umask($origmask);
JLog::add(
'SOME_ERROR_CODE',
__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_COULD_NOT_CREATE_DIRECTORY'), 'Path: ' . $path, JLog::WARNING, 'jerror'
);

Expand Down

0 comments on commit 21bae80

Please sign in to comment.