Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2025-02-17 04:02:51 +01:00 committed by GitHub
commit a5a5e7d3ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/ai/class/ai.class.php
View File

@ -233,8 +233,8 @@ class Ai
);
// Add a system message
$addDateTimeContext = 0;
if ($addDateTimeContext) {
$addDateTimeContext = false;
if ($addDateTimeContext) { // @phpstan-ignore-line
$prePrompt = ($prePrompt ? $prePrompt.(preg_match('/[\.\!\?]$/', $prePrompt) ? '' : '.').' ' : '').'Today we are '.dol_print_date(dol_now(), 'dayhourtext');
}
if ($prePrompt) {

2
htdocs/ai/lib/ai.lib.php
View File

@ -27,7 +27,7 @@
/**
* Prepare admin pages header
*
* @return array<string,array<string,string>>}>
* @return array<string,array<string,string>>
*/
function getLitOfAIFeatures()
{

2
htdocs/core/lib/geturl.lib.php
View File

@ -52,7 +52,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
if (!function_exists('curl_init')) {
return array('http_code' => 500, 'content' => '', 'curl_error_no' => 'PHP curl lib not available', 'curl_error_msg' => 'PHP curl library must be installed');
return array('http_code' => 500, 'content' => '', 'curl_error_no' => 1, 'curl_error_msg' => 'PHP curl library must be installed');
}
//setting the curl parameters.

2
htdocs/website/index.php
View File

@ -3548,7 +3548,7 @@ if (!GETPOST('hide_websitemenu')) {
print '<span class="websiteselection">';
print '<input type="image" class="valignmiddle buttonwebsite" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($action != 'editsource') ? '' : ' disabled="disabled"').'>';
print '<input type="image" class="valignmiddle buttonwebsite hideonsmartphone" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($action != 'editsource') ? '' : ' disabled="disabled"').'>';
// Print nav arrows
$pagepreviousid = 0;