diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index ea4e40367e6..e8eea25627e 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -121,6 +121,10 @@
 
 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
 
+	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
+        <severity>0</severity>
+	</rule>
+    
     <rule ref="Generic.VersionControl.SubversionProperties" />
 
 	<!-- Disallow usage of tab -->
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index f65f8131ee0..7dee233f436 100755
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1497,7 +1497,8 @@ class SMTPs
 	/**
 	 * Retrieves the MIME message Boundary
 	 *
-	 * @return string $_smtpsBoundary MIME message Boundary
+	 * @param  string $type				Type of boundary
+	 * @return string $_smtpsBoundary 	MIME message Boundary
 	 */
 	function _getBoundary($type='mixed')
 	{