Skip to content

Commit

Permalink
Code Style fixes (Thanks @b2z)
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge committed Aug 24, 2014
1 parent 9fa94ff commit 4ba6831
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions libraries/cms/model/actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function delete($cid)
// Get the id's of the items to delete
$pks = (array) $cid;

foreach ($pks AS $pk)
foreach ($pks as $pk)
{
$context = $this->option . '.' . $this->getName();

Expand Down Expand Up @@ -329,7 +329,7 @@ public function reorder($cid, $direction)

$pks = (array) $cid;

foreach ($pks AS $pk)
foreach ($pks as $pk)
{
$activeRecord = $this->getActiveRecord($pk);

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/model/administrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function loadForm($name, $source = null, $config = array(), $clear = fals
*/
protected function loadFormData($context = null)
{
if(is_null($context))
if (is_null($context))
{
$context = $this->getContext();
}
Expand Down
6 changes: 3 additions & 3 deletions libraries/cms/model/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,15 @@ public function allowAction($action, $assetName = null, $activeRecord = null)

$user = JFactory::getUser();

if($action == 'core.edit.own')
if ($action == 'core.edit.own')
{
// Not a record or isn't tracking ownership
if(is_null($activeRecord) || !isset($activeRecord->owner))
if (is_null($activeRecord) || !isset($activeRecord->owner))
{
$action = 'core.edit';
}
// Not the owner so the answer is no
elseif($user->id != $activeRecord->owner && !$user->authorise('core.admin', $assetName))
elseif ($user->id != $activeRecord->owner && !$user->authorise('core.admin', $assetName))
{
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/cms/model/collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ protected function getListQuery(JDatabaseQuery $query = null)

$activeFilters = $this->getActiveFilters();

foreach ($activeFilters AS $dataKeyName => $value)
foreach ($activeFilters as $dataKeyName => $value)
{
$query->where($dataKeyName . ' = ' . $db->quote($value));
}
Expand Down Expand Up @@ -491,7 +491,7 @@ protected function populateState($ordering = null, $direction = null)

$filters = $app->getUserStateFromRequest($context . '.filter', 'filter', array(), 'array');

foreach ($filters AS $name => $value)
foreach ($filters as $name => $value)
{
$this->state->set('filter.' . $name, $value);
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/renderer/jlayout.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class JRendererJlayout implements RendererInterface
/**
* Public constructor
*
* @param array $config An array of configuration options
* @param array $config An array of configuration options
*
* @since 3.4
*/
Expand Down

0 comments on commit 4ba6831

Please sign in to comment.