diff --git a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php index 71f0fb1a962b4..a0b58dde9d1e4 100644 --- a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php +++ b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php @@ -89,6 +89,8 @@ public static function association($newsfeedid) 'hasTooltip label label-association label-' . $item->lang_sef ); } + + unset($item); } $html = JLayoutHelper::render('joomla.content.associations', $items); diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php index ab6f4f8db99ba..41c5a9fd833b6 100644 --- a/administrator/components/com_plugins/models/plugins.php +++ b/administrator/components/com_plugins/models/plugins.php @@ -189,12 +189,14 @@ protected function translate(&$items) foreach ($items as &$item) { - $source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element; + $source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element; $extension = 'plg_' . $item->folder . '_' . $item->element; $lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true) || $lang->load($extension . '.sys', $source, null, false, true); $item->name = JText::_($item->name); } + + unset($item); } /** diff --git a/administrator/components/com_search/models/searches.php b/administrator/components/com_search/models/searches.php index 69a10b0f6c109..6df34cb59a408 100644 --- a/administrator/components/com_search/models/searches.php +++ b/administrator/components/com_search/models/searches.php @@ -165,6 +165,8 @@ public function getItems() $item->returns += count($result); } } + + unset($item); } return $items; diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php index ae93dd3ccb2bf..43fe2a431267c 100644 --- a/administrator/components/com_tags/views/tags/view.html.php +++ b/administrator/components/com_tags/views/tags/view.html.php @@ -31,9 +31,9 @@ class TagsViewTags extends JViewLegacy */ public function display($tpl = null) { - $this->state = $this->get('State'); - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); TagsHelper::addSubmenu('tags'); @@ -50,18 +50,20 @@ public function display($tpl = null) $this->ordering[$item->parent_id][] = $item->id; } + unset($item); + // Levels filter. - $options = array(); - $options[] = JHtml::_('select.option', '1', JText::_('J1')); - $options[] = JHtml::_('select.option', '2', JText::_('J2')); - $options[] = JHtml::_('select.option', '3', JText::_('J3')); - $options[] = JHtml::_('select.option', '4', JText::_('J4')); - $options[] = JHtml::_('select.option', '5', JText::_('J5')); - $options[] = JHtml::_('select.option', '6', JText::_('J6')); - $options[] = JHtml::_('select.option', '7', JText::_('J7')); - $options[] = JHtml::_('select.option', '8', JText::_('J8')); - $options[] = JHtml::_('select.option', '9', JText::_('J9')); - $options[] = JHtml::_('select.option', '10', JText::_('J10')); + $options = array(); + $options[] = JHtml::_('select.option', '1', JText::_('J1')); + $options[] = JHtml::_('select.option', '2', JText::_('J2')); + $options[] = JHtml::_('select.option', '3', JText::_('J3')); + $options[] = JHtml::_('select.option', '4', JText::_('J4')); + $options[] = JHtml::_('select.option', '5', JText::_('J5')); + $options[] = JHtml::_('select.option', '6', JText::_('J6')); + $options[] = JHtml::_('select.option', '7', JText::_('J7')); + $options[] = JHtml::_('select.option', '8', JText::_('J8')); + $options[] = JHtml::_('select.option', '9', JText::_('J9')); + $options[] = JHtml::_('select.option', '10', JText::_('J10')); $this->f_levels = $options; diff --git a/administrator/components/com_templates/models/templates.php b/administrator/components/com_templates/models/templates.php index 0f125ecf48a78..200de7cd29440 100644 --- a/administrator/components/com_templates/models/templates.php +++ b/administrator/components/com_templates/models/templates.php @@ -59,10 +59,12 @@ public function getItems() foreach ($items as &$item) { - $client = JApplicationHelper::getClientInfo($item->client_id); + $client = JApplicationHelper::getClientInfo($item->client_id); $item->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $item->element); } + unset($item); + return $items; } diff --git a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php index d7b2de700f0bb..d5b0d2f4a824c 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php +++ b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php @@ -12,7 +12,7 @@ // Initiasile related data. require_once JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'; $menuTypes = MenusHelper::getMenuLinks(); -$user = JFactory::getUser(); +$user = JFactory::getUser(); ?>
@@ -40,5 +40,6 @@
+ diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php index 89e94bde5f810..a5a34e9efc103 100644 --- a/administrator/components/com_users/helpers/debug.php +++ b/administrator/components/com_users/helpers/debug.php @@ -51,6 +51,8 @@ public static function getComponents() $item->text = JText::_($item->text); } + unset($item); + // Sort by component name JArrayHelper::sortObjects($items, 'text', 1, true, true); } @@ -82,6 +84,8 @@ public static function getDebugActions($component = null) { $actions[$action->title] = array($action->name, $action->description); } + + unset($action); } } diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php index e037057bfde10..c58cb5bbe8cae 100644 --- a/administrator/components/com_users/helpers/users.php +++ b/administrator/components/com_users/helpers/users.php @@ -97,7 +97,7 @@ public static function getActions() public static function getStateOptions() { // Build the filter options. - $options = array(); + $options = array(); $options[] = JHtml::_('select.option', '0', JText::_('JENABLED')); $options[] = JHtml::_('select.option', '1', JText::_('JDISABLED')); @@ -114,7 +114,7 @@ public static function getStateOptions() public static function getActiveOptions() { // Build the filter options. - $options = array(); + $options = array(); $options[] = JHtml::_('select.option', '0', JText::_('COM_USERS_ACTIVATED')); $options[] = JHtml::_('select.option', '1', JText::_('COM_USERS_UNACTIVATED')); @@ -130,7 +130,7 @@ public static function getActiveOptions() */ public static function getGroups() { - $db = JFactory::getDbo(); + $db = JFactory::getDbo(); $query = $db->getQuery(true) ->select('a.id AS value') ->select('a.title AS text') @@ -157,6 +157,8 @@ public static function getGroups() $option->text = str_repeat('- ', $option->level) . $option->text; } + unset($option); + return $options; } diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php index dc0ded7a2d05d..5cd741ba96088 100644 --- a/administrator/components/com_users/models/debuggroup.php +++ b/administrator/components/com_users/models/debuggroup.php @@ -69,6 +69,8 @@ public function getItems() } } } + + unset($asset); } return $assets; diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php index 491395a79757d..d3b7d679887e4 100644 --- a/administrator/components/com_users/models/debuguser.php +++ b/administrator/components/com_users/models/debuguser.php @@ -53,7 +53,7 @@ public function getItems() foreach ($actions as $action) { - $name = $action[0]; + $name = $action[0]; $level = $action[1]; // Check that we check this action for the level of the asset. @@ -69,6 +69,8 @@ public function getItems() } } } + + unset($asset); } return $assets; @@ -77,7 +79,7 @@ public function getItems() /** * Method to auto-populate the model state. * - * Note. Calling getState in this method will result in recursion. + * @note Calling getState in this method will result in recursion. * * @param string $ordering An optional ordering field. * @param string $direction An optional direction (asc|desc). diff --git a/administrator/components/com_users/models/groups.php b/administrator/components/com_users/models/groups.php index 17ffd78729a2b..8fcefaa890bc1 100644 --- a/administrator/components/com_users/models/groups.php +++ b/administrator/components/com_users/models/groups.php @@ -154,6 +154,8 @@ public function getItems() } } + unset($item); + // Add the items to the internal cache. $this->cache[$store] = $items; } diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php index f2f046ac462e6..2d3948417444a 100644 --- a/administrator/components/com_users/models/users.php +++ b/administrator/components/com_users/models/users.php @@ -250,6 +250,8 @@ public function getItems() } } + unset($item); + // Add the items to the internal cache. $this->cache[$store] = $items; }