Skip to content

fix(export): resolve missing data tables in ODT export by using isset() instead of property_exists() #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bolivarf wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

fix(export): resolve missing data tables in ODT export by using isset() instead of property_exists() #365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions inc/common.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@
/** @var array $LANG */
global $LANG;

$config = ['PATH_TO_TMP' => GLPI_DOC_DIR . '/_tmp'];
$config = ['PATH_TO_TMP' => GLPI_TMP_DIR];

$category = '';
$description = '';
Expand Down Expand Up @@ -1310,7 +1310,7 @@
} else {
$singledatas->setVars('datas_title', mb_strtoupper(__s('data', 'mreporting')), false, 'utf-8');
foreach ($datas as $key => $value) {
if (property_exists($singledatas, 'datas') && $singledatas->datas !== null) {
if (isset($singledatas->datas) || $singledatas->datas !== null) {

Check failure on line 1313 in inc/common.class.php

View workflow job for this annotation

GitHub Actions / GLPI 11.0.x - php:8.5 - mariadb:11.8 / Continuous integration 

Access to an undefined property Odtphp\Segment::$datas.

Check failure on line 1313 in inc/common.class.php

View workflow job for this annotation

GitHub Actions / GLPI 11.0.x - php:8.2 - mariadb:10.6 / Continuous integration 

Access to an undefined property Odtphp\Segment::$datas.

Check failure on line 1313 in inc/common.class.php

View workflow job for this annotation

GitHub Actions / GLPI 11.0.x - php:8.2 - mariadb:10.6 / Continuous integration 

Access to an undefined property Odtphp\Segment::$datas.

Check failure on line 1313 in inc/common.class.php

View workflow job for this annotation

GitHub Actions / GLPI 11.0.x - php:8.5 - mariadb:11.8 / Continuous integration 

Access to an undefined property Odtphp\Segment::$datas.
$singledatas->datas->row($key, ENT_NOQUOTES, 'utf-8');
$singledatas->datas->value($value, ENT_NOQUOTES, 'utf-8');
$singledatas->datas->merge();
Expand Down
Loading