Skip to content
Snippets Groups Projects
Commit 4989a7e9 authored by Ken Rickard's avatar Ken Rickard
Browse files

Fixes &$form_state pass by reference failures.

parent 7fe0285a
No related branches found
No related tags found
No related merge requests found
......@@ -123,7 +123,7 @@ function domain_configure() {
/**
* FormsAPI for configuring the domain module.
*/
function domain_configure_form($form, $form_state, $user_submitted = FALSE) {
function domain_configure_form($form, &$form_state, $user_submitted = FALSE) {
$root = variable_get('domain_root', '');
if (empty($root)) {
domain_set_primary_domain();
......@@ -416,7 +416,7 @@ function domain_values_from_form_state($form_state) {
* Indicates that a form should not process administrative messages and paths
* upon form submit. Used by the Domain User module.
*/
function domain_form($form, $form_state, $domain = array(), $arguments = array()) {
function domain_form($form, &$form_state, $domain = array(), $arguments = array()) {
$_domain = domain_get_domain();
// This action should be performed from the primary domain unless overridden.
if (!isset($arguments['ignore_domain_status_check'])) {
......@@ -553,7 +553,7 @@ function domain_form_submit($form, &$form_state) {
* Indicates that a form should not process administrative messages and paths
* upon form submit. Used by the Domain User module.
*/
function domain_delete_form($form, $form_state, $domain, $arguments = array()) {
function domain_delete_form($form, &$form_state, $domain, $arguments = array()) {
// This action should be performed from the primary domain.
domain_check_primary();
......@@ -597,7 +597,7 @@ function domain_delete_form_submit($form, &$form_state) {
* @param $form_state
* The current form state, passed by FormsAPI.
*/
function domain_advanced_form($form, $form_state) {
function domain_advanced_form($form, &$form_state) {
$form = array();
$node_types = node_type_get_names();
// In D7, type handling is strict, so make this value 0 or 1.
......@@ -1002,7 +1002,7 @@ function domain_batch_form_submit($form, &$form_state) {
*
* @see domain_get_user_domains()
*/
function domain_roles_form($form, $form_state) {
function domain_roles_form($form, &$form_state) {
$form = array();
$form['domain_add_roles'] = array(
'#type' => 'radios',
......
......@@ -180,7 +180,7 @@ function domain_theme_reset($domain) {
* @return
* A themed HTML form.
*/
function domain_theme_reset_form($form, $form_state, $domain) {
function domain_theme_reset_form($form, &$form_state, $domain) {
$extra['domain_id'] = array('#type' => 'value', '#value' => $domain['domain_id']);
$form = confirm_form($extra, t('Are you sure you wish to reset the theme for %name?', array('%name' => $domain['sitename'])), 'admin/structure/domain/theme/' . $domain['domain_id'], t('Submitting this form will restore default theme for this domain.'));
return $form;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment