This repository has been archived by the owner. It is now read-only.

Merge with CMS trunk change. #219

Merged
merged 2 commits into from Aug 13, 2011
Jump to file or symbol
Failed to load files and symbols.
+8 −4
Split
@@ -760,10 +760,12 @@ function &getChildren($recursive = false)
if (!$this->_allChildrenloaded)
{
$temp = $this->_constructor->get($this->id, true);
- $this->_children = $temp->getChildren();
- $this->_leftSibling = $temp->getSibling(false);
- $this->_rightSibling = $temp->getSibling(true);
- $this->setAllLoaded();
+ if ($temp) {
+ $this->_children = $temp->getChildren();
+ $this->_leftSibling = $temp->getSibling(false);
+ $this->_rightSibling = $temp->getSibling(true);
+ $this->setAllLoaded();
+ }
}
if ($recursive)
@@ -616,10 +616,12 @@ public function delete(&$pks)
if ($error)
{
JError::raiseWarning(500, $error);
+ return false;
}
else
{
JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
+ return false;
}
}