MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.139'

pull/712/head v2.3.139
Iglocska 2015-10-09 20:51:33 +02:00
parent 832c6403aa 24eae46640
commit 08b14aeaaf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":138}
{"major":2, "minor":3, "hotfix":139}

6
app/Model/AppModel.php
View File

@ -159,8 +159,10 @@ class AppModel extends Model {
// wrapper for UUID generation, compatible with cakephp <= 2.6 and cakephp and cakephp >= 2.7
public function generateUuid() {
if (isset($CakeText)) $uuid = CakeText::uuid();
else $uuid = String::uuid();
$version = Configure::version();
$version = explode('.', $version);
if (intval($version[0]) <= 2 && intval($version[1]) < 7) $uuid = String::uuid();
else $uuid = CakeText::uuid();
return $uuid;
}