Merge branch 'protector' into CorePack

XoopsX · Oct 6, 2017 · c99e959 · c99e959
2 parents e0d5ada + 93206c0
commit c99e959
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xoops_trust_path/modules/protector/admin/prefix_manager.php b/xoops_trust_path/modules/protector/admin/prefix_manager.php
@@ -121,7 +121,7 @@
                     $values[] = 'NULL';
                 // a number
                 // timestamp is numeric on some MySQL 4.1
-                } elseif (is_numeric($row[$j]) && $fields_meta->type != 'timestamp') {
+                } elseif (preg_match('/^[0-9.]+$/', $row[$j]) && $fields_meta->type != 'timestamp') {
                     $values[] = $row[$j];
                 // a binary field
                 // Note: with mysqli, under MySQL 4.1.3, we get the flag

diff --git a/xoops_trust_path/modules/protector/xoops_version.php b/xoops_trust_path/modules/protector/xoops_version.php
@@ -11,7 +11,7 @@
 $modversion['name'] = constant($constpref.'_NAME');
 $modversion['description'] = constant($constpref.'_DESC');
 $modversion['version'] = file_get_contents(dirname(__FILE__).'/include/version.txt');
-$modversion['detailed_version'] = $modversion['version'].'.1';
+$modversion['detailed_version'] = $modversion['version'].'.2';
 $modversion['credits'] = 'PEAK Corp.';
 $modversion['author'] = 'GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/)';
 $modversion['help'] = '';