++ избавляемся от Warning и Deprecated в запросах версии 2.09RC1

This commit is contained in:
2025-10-14 19:46:21 +05:00
parent d6f91c267f
commit 866ebeffbe

View File

@@ -553,8 +553,9 @@ function showrequestelement ($mixed, $template = '', $tparams = '', $req_item_nu
$item = str_replace('[tag:doctitle]', stripslashes(htmlspecialchars_decode($row->document_title)), $item);
$item = str_replace('[tag:docparent]', $row->document_parent, $item);
$item = str_replace('[tag:doclang]', $row->document_lang, $item);
$item = str_replace('[tag:docdate]', translate_date(strftime(DATE_FORMAT, $row->document_published)), $item);
$item = str_replace('[tag:doctime]', translate_date(strftime(TIME_FORMAT, $row->document_published)), $item);
// ИСПРАВЛЕНИЕ: Замена strftime() на date() (PHP 8.1+)
$item = str_replace('[tag:docdate]', translate_date(date(DATE_FORMAT, $row->document_published)), $item);
$item = str_replace('[tag:doctime]', translate_date(date(TIME_FORMAT, $row->document_published)), $item);
$item = str_replace('[tag:humandate]', human_date($row->document_published), $item);
$item = preg_replace_callback('/\[tag:date:([a-zA-Z0-9-. \/]+)\]/',
@@ -631,6 +632,13 @@ function request_parse($id)
$request_order_by_nat = intval($request->request_order_by_nat);
$request_asc_desc = $request->request_asc_desc;
// FIX: Инициализация переменных, которые используются в WHERE-условии,
// но могли быть не определены, чтобы избежать Undefined variable Warning.
$hide_current_condition = '';
$owner_condition = '';
$lang_condition = '';
$doctime = '';
// Генерируем строку условий
$where_cond = request_get_condition_sql_string($request->Id);
$where_cond = str_replace('%%PREFIX%%', PREFIX, $where_cond);
@@ -702,6 +710,7 @@ function request_parse($id)
$main_sql_query = "
SELECT
a.Id,
a.rubric_id,
a.document_title,
a.document_alias,
a.document_parent,
@@ -804,8 +813,9 @@ function request_parse($id)
$main_template = str_replace('[tag:pages:total]', $num_pages, $main_template);
$main_template = str_replace('[tag:doctotal]', $num_items, $main_template);
$main_template = str_replace('[tag:doconpage]', $x, $main_template);
$main_template = str_replace('[tag:docdate]', pretty_date(strftime(DATE_FORMAT, $AVE_Core->curentdoc->document_published)), $main_template);
$main_template = str_replace('[tag:doctime]', pretty_date(strftime(TIME_FORMAT, $AVE_Core->curentdoc->document_published)), $main_template);
// ИСПРАВЛЕНИЕ: Замена strftime() на date() для основного документа в запросе
$main_template = str_replace('[tag:docdate]', pretty_date(date(DATE_FORMAT, $AVE_Core->curentdoc->document_published)), $main_template);
$main_template = str_replace('[tag:doctime]', pretty_date(date(TIME_FORMAT, $AVE_Core->curentdoc->document_published)), $main_template);
$main_template = str_replace('[tag:docauthor]', get_username_by_id($AVE_Core->curentdoc->document_author_id), $main_template);
$main_template = preg_replace_callback('/\[tag:dropdown:([,0-9]+)\]/', function($m) use ($request) {
return request_get_dropdown($m[1], (int)$request->rubric_id, (int)$request->Id);