Merge branch 'develop' into phoenix

Author: carlbennett

src/controllers/User/Register.php

@@ -196,7 +196,7 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
       $mail = new PHPMailer( true ); // true enables exceptions
       $mail_config = Common::$config->email;
 
-      $state->mail &= $mail;
+      $state->mail = &$mail;
       $state->token = ( $user ? $user->getVerificationToken() : null );
       $state->user_id = $user_id;
 

src/controllers/User/ResetPassword.php

@@ -111,7 +111,7 @@ protected function doPasswordReset( UserResetPasswordModel &$model, &$data ) {
       $mail = new PHPMailer( true ); // true enables exceptions
       $mail_config = Common::$config->email;
 
-      $state->mail &= $mail;
+      $state->mail = &$mail;
       $state->token = $model->user->getVerificationToken();
       $state->user = $model->user;
 

src/templates/Comment/Delete.phtml

@@ -27,7 +27,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;

src/templates/Comment/Edit.phtml

@@ -28,7 +28,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;

src/templates/Document/Create.phtml

@@ -28,7 +28,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;

src/templates/Document/Delete.phtml

@@ -27,7 +27,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;

src/templates/Document/Edit.phtml

@@ -31,7 +31,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;

src/templates/GlobalErrorHandler.phtml

@@ -120,7 +120,7 @@
         <header class="red">Internal Error</header>
         <section class="red">
           <p>An internal server error occurred while processing your request.</p>
-          <p>The BNETDocs staff has been notified of this issue.</p>
+          <p>The BNETDocs staff have been notified of this issue.</p>
           <p>Please <a href="https://github.com/BNETDocs/bnetdocs-web/issues/new?title=Internal+Error">report this issue to GitHub</a> if it persists.</p>
         </section>
       </article>

src/templates/News/Create.phtml

@@ -28,7 +28,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;

src/templates/News/Delete.phtml

@@ -27,7 +27,7 @@ switch ($this->getContext()->error) {
     break;
   case "INTERNAL_ERROR":
     $message = "An internal error occurred while processing your request. "
-      . "Our staff has been notified of the issue. Try again later.";
+      . "Our staff have been notified of the issue. Try again later.";
     break;
   default:
     $message = $this->getContext()->error;