[TikiWiki-commits] [Git][tikiwiki/tiki][24.x] [ENH] Allow also dash in the profile object names

SoftStart Code pushed to branch 24.x at Tiki Wiki CMS Groupware / Tiki


Commits:
af10cfdd by Sandeep D at 2025-10-08T00:13:04+00:00
[ENH] Allow also dash in the profile object names
---
* [ENH] Allow also dash in the profile object names

See merge request tikiwiki/tiki!8727

- - - - -


2 changed files:

- lib/core/Tiki/Profile.php
- lib/test/core/Tiki/ProfileTest.php


Changes:

=====================================
lib/core/Tiki/Profile.php
=====================================
@@ -11,11 +11,11 @@ use Symfony\Component\Yaml\Yaml;
 
 class Tiki_Profile
 {
-    const SHORTER_PATTERN = '/^\$((([\w\.\/-]+):)?(\w+))$/';
-    const SHORT_PATTERN = '/^\$((([\w\.\/-]+):)?((\w+):))?(\w+)$/';
-    const LONG_PATTERN = '/\$profileobject:((([\w\.\/-]+):)?((\w+):))?(\w+)\$/';
-    const INFO_REQUEST = '/\$profilerequest:([^\$\|]+)(\|(\w+))?\$([^\$]*)\$/';
-    const PREFERENCE_PATTERN = '/\$preference:(\w+)\$/';
+    private const SHORTER_PATTERN = '/^\$((([\w\.\/-]+):)?([\w-]+))$/';
+    public const SHORT_PATTERN = '/^\$((([\w\.\/-]+):)?(([\w-]+):))?([\w-]+)$/';
+    public const LONG_PATTERN = '/\$profileobject:((([\w\.\/-]+):)?(([\w-]+):))?([\w-]+)\$/';
+    private const INFO_REQUEST = '/\$profilerequest:([^\$\|]+)(\|([\w-]+))?\$([^\$]*)\$/';
+    private const PREFERENCE_PATTERN = '/\$preference:([\w-]+)\$/';
 
     private $transport;
     private $pageUrl;


=====================================
lib/test/core/Tiki/ProfileTest.php
=====================================
@@ -173,7 +173,8 @@ class ProfileTest extends TikiTestCase
             ['$profileobject:user_tracker_acceptedTerms$', true],
             ['$profilestikiorg:BugTrackerProfile:bug_tracker', true],
             ['$profiles.tiki.org:Client.Management.Profile:client_tracker', false],
-            ['$profiles.tiki.org:Sample.Data.Profile', false]
+            ['$profiles.tiki.org:Sample.Data.Profile', false],
+            ['$profiles.tiki.org:Post-it_Sticky_Note_15', true],
         ];
     }
 



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/af10cfdd7ae205cd517eeb29602110d73483ffb1

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/af10cfdd7ae205cd517eeb29602110d73483ffb1
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs