Skip to content

Commit af84362

Browse files
favincenfavincen
authored
Merge branch 'Combodo:develop' into issue/8838-fix_backup_status_mysqldir_not_usable
2 parents fbee01f + dd82950 commit af84362

File tree

2,198 files changed

+55386
-61611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,198 files changed

+55386
-61611
lines changed

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,6 @@ You want to contribute to iTop? Many thanks to you! 🎉 👍
55
Here are some guidelines that will help us integrate your work!
66

77

8-
## Contributions
9-
10-
11-
```
12-
_ _ _ _ _ __ _
13-
| | | | __ _ ___| | _| |_ ___ | |__ ___ _ __ / _| ___ ___| |_
14-
| |_| |/ _` |/ __| |/ / __/ _ \| '_ \ / _ \ '__| |_ / _ \/ __| __|
15-
| _ | (_| | (__| <| || (_) | |_) | __/ | | _| __/\__ \ |_
16-
|_| |_|\__,_|\___|_|\_\\__\___/|_.__/ \___|_| |_| \___||___/\__|
17-
```
18-
This repository is part of Hacktoberfest. Contributions are welcome! Feel free to suggest improvements, add translation, fix bugs, or propose new features. Thank you for contributing !
198

209

2110
### Subjects

‎addons/userrights/userrightsprofile.class.inc.php‎

Lines changed: 181 additions & 257 deletions
Large diffs are not rendered by default.

‎application/DBSearchHelper.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* @copyright Copyright (C) 2010-2024 Combodo SAS
45
* @license http://opensource.org/licenses/AGPL-3.0
@@ -48,13 +49,12 @@ public static function AddContextFilter(?DBSearch $oSearch): void
4849
$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
4950
$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
5051
}
51-
}
52-
catch (Exception $e) {
52+
} catch (Exception $e) {
5353
// If filtering fails just ignore it
5454
}
5555
}
5656
}
5757
}
5858
}
5959
}
60-
}
60+
}

‎application/application.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* @copyright Copyright (C) 2010-2024 Combodo SAS
45
* @license http://opensource.org/licenses/AGPL-3.0

0 commit comments

Comments
 (0)