Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

chore(release):rebase dev-22.04.x on 22.04.x #11627

Merged
merged 4 commits into from
Aug 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/class/centreonAuth.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ protected function checkUser($username, $password, $token)
*/
$statement = $this->pearDB->prepare(
"SELECT * FROM `contact` " .
"WHERE `contact_alias` = :contact_alias" .
"WHERE `contact_alias` = :contact_alias " .
"AND `contact_activate` = '1' AND `contact_register` = '1' LIMIT 1"
);
$statement->bindValue(':contact_alias', $this->pearDB->escape($username, true), \PDO::PARAM_STR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const useStyles = makeStyles<Theme, { columns }, string>((theme) => ({
columnGap: theme.spacing(2),
display: 'grid',
gridTemplateColumns: `repeat(${columns}, 1fr) ${theme.spacing(6)}`,
gridTemplateRows: 'min-content',
}),
}));

Expand Down
2 changes: 1 addition & 1 deletion www/install/insertBaseConf.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- Insert version
--

INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '22.04.2');
INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '22.04.3');

--
-- Contenu de la table `contact`
Expand Down
20 changes: 20 additions & 0 deletions www/install/php/Update-22.04.3.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

/*
* Copyright 2005 - 2022 Centreon (https://www.centreon.com/)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* For more information : contact@centreon.com
*
*/