Merge pull request #396 from GOCDB/hotfix-5.10.X

Allow single quote in user identifiers to master
GOCDB · Nov 15, 2022 · ddda6b5 · ddda6b5
2 parents e761dab + 1b7d762
commit ddda6b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/config/gocdb_schema.xml b/config/gocdb_schema.xml
@@ -486,15 +486,15 @@
         <!-- Allows whitespace in the key, but not trailing or leading -->
         <regex>/^[a-zA-Z0-9@_\-\[\]\+\.]+(\s*[a-zA-Z0-9@_\-\[\]\+\.]+)*$/</regex>
 	</field>
-	<field>
-	    <!-- Identifier key value -->
-	    <fname>VALUE</fname>
-	    <length>255</length>
-	    <!-- negation regex - allow all chars except negated -->
-        <!--Allows most characters, including whitespace. However, no trailing or leading whitespace permitted -->
-        <!-- <regex>/^[^`'\"&lt;&gt;\s]+(\s*[^`'\"&lt;&gt;\s]+)*$/</regex> -->
-        <regex>/^[^`'\"&lt;&gt;\s]+(\s*[^`'\"&lt;&gt;\s]+)*$/</regex>
-	</field>
+    <field>
+        <!-- Identifier key value -->
+        <fname>VALUE</fname>
+        <length>255</length>
+        <!-- Allows most characters, including whitespace.
+             However, no trailing or leading whitespace is permitted.
+          -->
+        <regex>/^[^`\"&lt;&gt;\s]+(\s*[^`\"&lt;&gt;\s]+)*$/</regex>
+    </field>
     </entity>
     <!-- ==========================================================  -->
     <entity>

diff --git a/htdocs/web_portal/static_html/goc5_logo.html b/htdocs/web_portal/static_html/goc5_logo.html
@@ -4,7 +4,7 @@
 <!--	<img src="img/Logo-1.6.png" class="logo_image" height="39" style="vertical-align: middle;"/>-->
   <h3    class="Logo_Text Small_Bottom_Margin Standard_Padding"
          style="vertical-align: middle; margin-left: 0.2em;">
-         GOCDB 5.10.0
+         GOCDB 5.10.1
      </h3>
 
 </a>