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

Commit

Permalink
Merge branch 'hotfix/3.2.15' into hotfix/3.3.6
Browse files Browse the repository at this point in the history
Conflicts:
	system/bin/txpurge
	system/config/constants.php
	system/docs/CHANGELOG.md
	system/modules/calendar/languages/sl/default.xlf
	system/modules/core/languages/es/tl_content.xlf
	system/modules/core/languages/fr/default.xlf
	system/modules/core/languages/fr/explain.xlf
	system/modules/core/languages/fr/tl_form_field.xlf
	system/modules/core/languages/fr/tl_page.xlf
	system/modules/core/languages/ja/tl_content.xlf
	system/modules/core/languages/ja/tl_module.xlf
	system/modules/core/languages/ja/tl_style.xlf
	system/modules/core/languages/my/default.xlf
	system/modules/core/languages/my/exception.xlf
	system/modules/core/languages/my/tl_content.xlf
	system/modules/core/languages/my/tl_files.xlf
	system/modules/core/languages/my/tl_form.xlf
	system/modules/core/languages/my/tl_form_field.xlf
	system/modules/core/languages/my/tl_install.xlf
	system/modules/core/languages/my/tl_settings.xlf
	system/modules/core/languages/my/tl_user.xlf
	system/modules/core/languages/ru/tl_files.xlf
	system/modules/core/languages/sk/tl_page.xlf
	system/modules/core/languages/sl/modules.xlf
	system/modules/core/languages/sl/tl_files.xlf
	system/modules/core/modules/ModuleArticle.php
	system/modules/core/modules/ModuleArticlenav.php
  • Loading branch information
leofeyer committed Oct 31, 2014
2 parents 24083ca + 243d3b6 commit 4187975
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/Resources/contao/dca/tl_calendar_events.php
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ public function toggleIcon($row, $href, $label, $title, $icon, $attributes)
{
if (strlen(Input::get('tid')))
{
$this->toggleVisibility(Input::get('tid'), (Input::get('state') == 1));
$this->toggleVisibility(Input::get('tid'), (Input::get('state') == 1), (@func_get_arg(12) ?: null));
$this->redirect($this->getReferer());
}

Expand All @@ -1018,8 +1018,9 @@ public function toggleIcon($row, $href, $label, $title, $icon, $attributes)
* Disable/enable a user group
* @param integer
* @param boolean
* @param \DataContainer
*/
public function toggleVisibility($intId, $blnVisible)
public function toggleVisibility($intId, $blnVisible, DataContainer $dc=null)
{
// Check permissions to edit
Input::setGet('id', $intId);
Expand All @@ -1044,11 +1045,11 @@ public function toggleVisibility($intId, $blnVisible)
if (is_array($callback))
{
$this->import($callback[0]);
$blnVisible = $this->$callback[0]->$callback[1]($blnVisible, $this);
$blnVisible = $this->$callback[0]->$callback[1]($blnVisible, ($dc ?: $this));
}
elseif (is_callable($callback))
{
$blnVisible = $callback($blnVisible, $this);
$blnVisible = $callback($blnVisible, ($dc ?: $this));
}
}
}
Expand Down

0 comments on commit 4187975

Please sign in to comment.