CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix in SmartyExtend class and user name set

Browse Source
This commit is contained in:
Clemens Schwaighofer
2023-03-10 15:25:54 +09:00
parent e3bd2c1c3b
commit b9031c8c2b
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/admin/class_test.smarty.php
View File

@@ -144,7 +144,8 @@ $smarty->setSmartyVarsAdmin(
G_TITLE,
ADMIN_STYLESHEET,
ADMIN_JAVASCRIPT,
PAGE_WIDTH
PAGE_WIDTH,
$_SESSION['USER_NAME'] ?? ''
);
// error message

2
www/admin/test.env
View File

@@ -1 +1 @@
../../4dev/tests/dotenv/test.env
../../4dev/tests/Get/dotenv/test.env

6
www/lib/CoreLibs/Template/SmartyExtend.php
View File

@@ -490,6 +490,7 @@ class SmartyExtend extends \Smarty
null,
null,
null,
null,
$set_stylesheet,
$set_javascript
);
@@ -508,6 +509,7 @@ class SmartyExtend extends \Smarty
* @param string|null $set_admin_stylesheet ADMIN_STYLESHEET
* @param string|null $set_admin_javascript ADMIN_JAVASCRIPT
* @param string|null $set_page_width PAGE_WIDTH
* @param string|null $set_user_name _SESSION['USER_NAME']
* @param \CoreLibs\Admin\Backend|null $cms Optinal Admin Backend for
* smarty variables merge
* @return void
@@ -523,6 +525,7 @@ class SmartyExtend extends \Smarty
?string $set_admin_stylesheet = null,
?string $set_admin_javascript = null,
?string $set_page_width = null,
?string $set_user_name = null,
?\CoreLibs\Admin\Backend $cms = null
): void {
$this->setSmartyVars(
@@ -538,6 +541,7 @@ class SmartyExtend extends \Smarty
$set_admin_stylesheet,
$set_admin_javascript,
$set_page_width,
$set_user_name,
null,
null
);
@@ -579,9 +583,9 @@ class SmartyExtend extends \Smarty
?string $set_admin_stylesheet = null,
?string $set_admin_javascript = null,
?string $set_page_width = null,
?string $set_user_name = null,
?string $set_stylesheet = null,
?string $set_javascript = null,
?string $set_user_name = null,
): void {
// trigger deprecation
if (