Merge pull request #9405 from alikon/patch-60

Regression: Unable to use Terms of Service with the core user plugin …
joomla · Mar 14, 2016 · b9b7629 · b9b7629
2 parents d9264d8 + 4d88da8
commit b9b7629
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
@@ -363,6 +363,11 @@ public function onUserBeforeSave($user, $isnew, $data)
 				throw new InvalidArgumentException(JText::_('PLG_USER_PROFILE_ERROR_INVALID_DOB'));
 			}
 		}
+		// Check that the tos are valid.
+		if (!($data['profile']['tos']))
+		{
+			throw new InvalidArgumentException(JText::_('PLG_USER_PROFILE_FIELD_TOS_DESC_SITE'));
+		}
 
 		return true;
 	}

diff --git a/plugins/user/profile/profiles/profile.xml b/plugins/user/profile/profiles/profile.xml
@@ -112,11 +112,11 @@
 			<field
 				name="tos"
 				type="tos"
-				default=""
+				default="0"
 				label="PLG_USER_PROFILE_FIELD_TOS_LABEL"
 				description="PLG_USER_PROFILE_FIELD_TOS_DESC">
 				<option value="1">PLG_USER_PROFILE_OPTION_AGREE</option>
-				<option value="">JNO</option>
+				<option value="0">JNO</option>
 			</field>
 		</fieldset>
 	</fields>