summaryrefslogtreecommitdiff
path: root/modules/locale
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2013-01-07 22:23:23 -0500
committerDavid Rothstein <drothstein@gmail.com>2013-01-07 22:23:23 -0500
commit3e5c778d4a89c8305b770c3f7cf1e81de801e094 (patch)
tree283567d2587c825c3045876865349c0efcfd1a1d /modules/locale
parent3d169b3bb6491e8ebc69194c717ed61ad894c5d8 (diff)
downloadbrdo-3e5c778d4a89c8305b770c3f7cf1e81de801e094.tar.gz
brdo-3e5c778d4a89c8305b770c3f7cf1e81de801e094.tar.bz2
Issue #1565322 by Jorrit: Fixed Notice in locale_languages_edit_form_validate().
Diffstat (limited to 'modules/locale')
-rw-r--r--modules/locale/locale.admin.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc
index 253535751..f1a71ddfe 100644
--- a/modules/locale/locale.admin.inc
+++ b/modules/locale/locale.admin.inc
@@ -388,13 +388,13 @@ function locale_languages_edit_form_validate($form, &$form_state) {
form_set_error('prefix', t('Domain and path prefix values should not be set at the same time.'));
}
if (!empty($form_state['values']['domain']) && $duplicate = db_query("SELECT language FROM {languages} WHERE domain = :domain AND language <> :language", array(':domain' => $form_state['values']['domain'], ':language' => $form_state['values']['langcode']))->fetchField()) {
- form_set_error('domain', t('The domain (%domain) is already tied to a language (%language).', array('%domain' => $form_state['values']['domain'], '%language' => $duplicate->language)));
+ form_set_error('domain', t('The domain (%domain) is already tied to a language (%language).', array('%domain' => $form_state['values']['domain'], '%language' => $duplicate)));
}
if (empty($form_state['values']['prefix']) && language_default('language') != $form_state['values']['langcode'] && empty($form_state['values']['domain'])) {
form_set_error('prefix', t('Only the default language can have both the domain and prefix empty.'));
}
if (!empty($form_state['values']['prefix']) && $duplicate = db_query("SELECT language FROM {languages} WHERE prefix = :prefix AND language <> :language", array(':prefix' => $form_state['values']['prefix'], ':language' => $form_state['values']['langcode']))->fetchField()) {
- form_set_error('prefix', t('The prefix (%prefix) is already tied to a language (%language).', array('%prefix' => $form_state['values']['prefix'], '%language' => $duplicate->language)));
+ form_set_error('prefix', t('The prefix (%prefix) is already tied to a language (%language).', array('%prefix' => $form_state['values']['prefix'], '%language' => $duplicate)));
}
}