Merge pull request #1557 from voltan/develop

Fix #1542
pi-engine · Sep 6, 2017 · ca9e7e9 · ca9e7e9
2 parents fde8b58 + 487d1be
commit ca9e7e9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/usr/custom/module/user/config/form.register.php.dist b/usr/custom/module/user/config/form.register.php.dist
@@ -28,7 +28,7 @@ $captchaElement = array(
     'element' => Pi::service('form')->getReCaptcha($captchaMode)
 );
 
-return array(
+$form = array(
     // Use user module field
     'email',
     'name',
@@ -102,3 +102,9 @@ return array(
         ),
     ),
 );
+
+if ($captchaMode == 0) {
+    unset($form['captcha']);
+}
+
+return $form;
diff --git a/usr/module/user/config/form.register.php b/usr/module/user/config/form.register.php
@@ -1,15 +1,15 @@
 <?php
 /**
-* Pi Engine (http://pialog.org)
-*
-* @link            http://code.pialog.org for the Pi Engine source repository
-* @copyright       Copyright (c) Pi Engine http://pialog.org
-* @license         http://pialog.org/license.txt BSD 3-Clause License
-*/
+ * Pi Engine (http://pialog.org)
+ *
+ * @link            http://code.pialog.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://pialog.org
+ * @license         http://pialog.org/license.txt BSD 3-Clause License
+ */
 
 /**
-* User register form config
-*/
+ * User register form config
+ */
 
 $termEnable = Pi::user()->config('register_term');
 $termUrl = Pi::user()->config('register_term_url');
@@ -28,7 +28,7 @@
     'element' => Pi::service('form')->getReCaptcha($captchaMode)
 );
 
-return array(
+$form = array(
     // Use user module field
     'email',
     'name',
@@ -84,3 +84,9 @@
         ),
     ),
 );
+
+if ($captchaMode == 0) {
+    unset($form['captcha']);
+}
+
+return $form;