mirror of https://github.com/MISP/MISP
Merge branch 'hotfix-2.1.33'
commit
7f3e8a5910
|
@ -589,7 +589,7 @@ class AttributesController extends AppController {
|
|||
else
|
||||
$attribute['type'] = 'comment';
|
||||
$attribute['value'] = $reference;
|
||||
$attribute['distribution'] = 3; // 'All communities'
|
||||
$attribute['distribution'] = '3'; // 'All communities'
|
||||
// add attribute to the array that will be saved
|
||||
$attributes[] = $attribute;
|
||||
}
|
||||
|
|
|
@ -424,7 +424,7 @@ class UsersController extends AppController {
|
|||
$params = array('recursive' => 0,
|
||||
'fields' => $fields,
|
||||
'group' => array('User.org'),
|
||||
'order' => array('User.org'),
|
||||
'order' => array('UPPER(User.org)'),
|
||||
);
|
||||
$orgs = $this->User->find('all', $params);
|
||||
$this->set('orgs', $orgs);
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<?php
|
||||
echo $this->Session->flash('auth');
|
||||
?>
|
||||
<table style="width:1200px;margin-left:auto;margin-right:auto;">
|
||||
<table style="width:1250px;margin-left:auto;margin-right:auto;">
|
||||
<tr>
|
||||
<td style="text-align:right;width:250px;padding-right:50px">
|
||||
<?php
|
||||
|
@ -20,7 +20,7 @@
|
|||
<?php
|
||||
}
|
||||
?>
|
||||
<td style="width:600px">
|
||||
<td style="width:650px">
|
||||
<span style="font-size:18px;"><?php
|
||||
if (true == Configure::read('MISP.welcome_text_top')) {
|
||||
echo Configure::read('MISP.welcome_text_top');
|
||||
|
|
Loading…
Reference in New Issue