forks/baikal
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into no-standard-sqlite-db

Browse source
This commit is contained in:
Evert Pot 2016-02-09 21:44:52 -05:00
commit 20227344d8
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -20,6 +20,7 @@ ChangeLog
* Moved documentation to sabre.io.
* #381: SQLite database woes. The database is now created from scratch when
installing.
* #320: Allow underscores in calendar/addressbook uris.
0.2.7 (2014-02-02)

6
Core/Frameworks/Formal/Form.php
View file

@ -308,8 +308,8 @@ class Form {
}
public function validateTokenid($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement) {
if(!preg_match("/^[a-z0-9\-]+$/", $sValue)) {
return "<strong>" . $oElement->option("label") . "</strong> is not valid. Allowed characters are digits, lowercase letters and the dash symbol '-'.";
if(!preg_match("/^[a-z0-9\-_]+$/", $sValue)) {
return "<strong>" . $oElement->option("label") . "</strong> is not valid. Allowed characters are digits, lowercase letters, the dash and underscore symbol.";
}
return TRUE;
@ -425,4 +425,4 @@ HTML;
public function refreshed() {
return intval(\Flake\Util\Tools::POST("refreshed")) === 1;
}
}
}