Remove trailing commas in arrays and make sure there's a space after ever #413

Merged
merged 1 commit into from Oct 1, 2011
View
4 libraries/joomla/cache/storage/file.php
@@ -532,7 +532,7 @@ protected function _cleanPath($path, $ds = DS)
*
* @since 11.1
*/
- protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS','.DS_Store','__MACOSX'), $excludefilter = array('^\..*','.*~'))
+ protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'), $excludefilter = array('^\..*', '.*~'))
{
// Initialise variables.
$arr = array();
@@ -618,7 +618,7 @@ protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullp
*
* @since 11.1
*/
- protected function _folders($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS','.DS_Store','__MACOSX'), $excludefilter = array('^\..*'))
+ protected function _folders($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'), $excludefilter = array('^\..*'))
{
// Initialise variables.
$arr = array();
View
2 libraries/joomla/html/html/jgrid.php
@@ -147,7 +147,7 @@ public static function published($value, $i, $prefix = '', $enabled = true, $che
$states = array(1 => array('unpublish', 'JPUBLISHED', 'JLIB_HTML_UNPUBLISH_ITEM', 'JPUBLISHED', false, 'publish', 'publish'),
0 => array('publish', 'JUNPUBLISHED', 'JLIB_HTML_PUBLISH_ITEM', 'JUNPUBLISHED', false, 'unpublish', 'unpublish'),
2 => array('unpublish', 'JARCHIVED', 'JLIB_HTML_UNPUBLISH_ITEM', 'JARCHIVED', false, 'archive', 'archive'),
- -2 => array('publish', 'JTRASHED', 'JLIB_HTML_PUBLISH_ITEM', 'JTRASHED', false, 'trash', 'trash'),);
+ -2 => array('publish', 'JTRASHED', 'JLIB_HTML_PUBLISH_ITEM', 'JTRASHED', false, 'trash', 'trash'));
// Special state for dates
if ($publish_up || $publish_down)
View
12 libraries/joomla/html/html/select.php
@@ -27,7 +27,7 @@
static protected $_optionDefaults = array(
'option' => array('option.attr' => null, 'option.disable' => 'disable', 'option.id' => null, 'option.key' => 'value',
'option.key.toHtml' => true, 'option.label' => null, 'option.label.toHtml' => true, 'option.text' => 'text',
- 'option.text.toHtml' => true,),);
+ 'option.text.toHtml' => true));
/**
* Generates a yes/no radio list.
@@ -81,7 +81,7 @@ public static function genericlist($data, $name, $attribs = null, $optKey = 'val
$translate = false)
{
// Set default options
- $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false,));
+ $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false));
if (is_array($attribs) && func_num_args() == 3)
{
// Assume we have an options array
@@ -160,7 +160,7 @@ public static function groupedlist($data, $name, $options = array())
// Set default options and overwrite with anything passed in
$options = array_merge(
JHtml::$formatOptions,
- array('format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.label.toHtml' => true, 'id' => false,),
+ array('format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.label.toHtml' => true, 'id' => false),
$options
);
@@ -281,7 +281,7 @@ public static function groupedlist($data, $name, $options = array())
public static function integerlist($start, $end, $inc, $name, $attribs = null, $selected = null, $format = '')
{
// Set default options
- $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null,));
+ $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null));
if (is_array($attribs) && func_num_args() == 5)
{
// Assume we have an options array
@@ -387,7 +387,7 @@ public static function optgroup($text, $optKey = 'value', $optText = 'text')
public static function option($value, $text = '', $optKey = 'value', $optText = 'text', $disable = false)
{
$options = array('attr' => null, 'disable' => false, 'option.attr' => null, 'option.disable' => 'disable', 'option.key' => 'value',
- 'option.label' => null, 'option.text' => 'text',);
+ 'option.label' => null, 'option.text' => 'text');
if (is_array($optKey))
{
// Merge in caller's options
@@ -481,7 +481,7 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
$options = array_merge(
JHtml::$formatOptions,
self::$_optionDefaults['option'],
- array('format.depth' => 0, 'groups' => true, 'list.select' => null, 'list.translate' => false,)
+ array('format.depth' => 0, 'groups' => true, 'list.select' => null, 'list.translate' => false)
);
if (is_array($optKey))
View
2 libraries/joomla/html/parameter/element/timezones.php
@@ -90,7 +90,7 @@ public function fetchElement($name, $value, &$node, $control_name)
JHtml::_('select.option', 11.5, JText::_('UTC__11_30__NORFOLK_ISLAND')),
JHtml::_('select.option', 12, JText::_('UTC__12_00__AUCKLAND__WELLINGTON__FIJI__KAMCHATKA')),
JHtml::_('select.option', 12.75, JText::_('UTC__12_45__CHATHAM_ISLAND')), JHtml::_('select.option', 13, JText::_('UTC__13_00__TONGA')),
- JHtml::_('select.option', 14, JText::_('UTC__14_00__KIRIBATI')),);
+ JHtml::_('select.option', 14, JText::_('UTC__14_00__KIRIBATI')));
return JHtml::_(
'select.genericlist',