do not require placeholder in group name template when only one reque…

…sted
anovikov · Jul 13, 2010 · 96445d4 · 96445d4
1 parent f87eab7
commit 96445d4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/group/autogroup_form.php b/group/autogroup_form.php
@@ -147,10 +147,13 @@ function validation($data, $files) {
         }
 
        /// Check the naming scheme
-        $matchcnt = preg_match_all('/[#@]{1,1}/', $data['namingscheme'], $matches);
-
-        if ($matchcnt != 1) {
-            $errors['namingscheme'] = get_string('badnamingscheme', 'group');
+        if ($data['groupby'] == 'groups' and $data['number'] == 1) {
+            // we can use the name as is because there will be only one group max
+        } else {
+            $matchcnt = preg_match_all('/[#@]{1,1}/', $data['namingscheme'], $matches);
+            if ($matchcnt != 1) {
+                $errors['namingscheme'] = get_string('badnamingscheme', 'group');
+            }
         }
 
         return $errors;