Fix a bug where name was not being copied when adding a new group, a=chris
Fix a bug where name was not being copied when adding a new group, a=chris
diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php
index 5f885f4cd..86895b2f3 100644
--- a/src/controllers/components/SocialComponent.php
+++ b/src/controllers/components/SocialComponent.php
@@ -230,13 +230,13 @@ class SocialComponent extends Component implements CrawlConstants
return $parent->redirectWithMessage(
tl('social_component_groupname_unavailable'));
}
- } else if ($name != ""){
+ } else if (!empty($name)) {
$_REQUEST['arg'] = "creategroup";
$_REQUEST['add_refer'] = 1;
return $parent->redirectWithMessage(
tl('social_component_name_available'),
['add_refer', 'arg', 'context', 'end_row',
- 'group_limit', 'num_show', 'start_row',
+ 'group_limit', 'name', 'num_show', 'start_row',
'user_filter', 'user_sorts',"visible_users"]);
}
break;
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index 3e138acb5..29ab2c3f2 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -1316,7 +1316,7 @@ wiki_element_page_list = "%s Group Page List"
wiki_element_group_feed = "%s Group Feed"
wiki_element_redirect_to = "Redirects to:"
wiki_element_page_no_exist = "%s page does not exist."
-wiki_element_create_edit = "You can create this page by using the edit link above."
+wiki_element_create_edit = "You can create this page by selecting edit from the dropdown above."
wiki_element_use_form_below = "Or you can use the form below to create or edit a different page."
wiki_element_submit = "Submit"
wiki_element_syntax_summary = "Wiki Syntax Guide"
@@ -1420,7 +1420,7 @@ basic_js_too_many_files = "Trying to add too many files!"
helpbutton_helper_question_mark = "?"
helpbutton_helper_edit = "Edit"
helpbutton_helper_not_available = "Unable to load Help article!"
-helpbutton_helper_create_edit = "You can create this page by using the edit link above."
+helpbutton_helper_create_edit = "You can create this page by selecting edit from the dropdown above."
helpbutton_helper_page_no_exist = "%s page does not exist."
helpbutton_helper_read = "Read"
;
diff --git a/src/views/WikiView.php b/src/views/WikiView.php
index 60e180871..95bd63024 100644
--- a/src/views/WikiView.php
+++ b/src/views/WikiView.php
@@ -121,7 +121,7 @@ class WikiView extends View
$human_page_name),
];
}
- if ($data['PAGE_HAS_RELATIONSHIPS'] > 0) {
+ if (!empty($data['PAGE_HAS_RELATIONSHIPS'])) {
$relationship_mode = [
"relationships" => tl('wiki_view_page_relationships',
$human_page_name),
diff --git a/src/views/elements/ManagegroupsElement.php b/src/views/elements/ManagegroupsElement.php
index 13a239ad9..13a94a1bf 100755
--- a/src/views/elements/ManagegroupsElement.php
+++ b/src/views/elements/ManagegroupsElement.php
@@ -374,7 +374,7 @@ class ManagegroupsElement extends Element
name="name" maxlength="<?= C\SHORT_TITLE_LEN ?>"
value="<?= $data['CURRENT_GROUP']['name'] ?>"
class="narrow-field" <?php
- if ($editgroup) {
+ if (!empty($data['CURRENT_GROUP']['name'])) {
e(' disabled="disabled" ');
}
?> /></td><?php
@@ -1016,4 +1016,4 @@ class ManagegroupsElement extends Element
</table>
<?php
}
-}
\ No newline at end of file
+}