From 0bdd4c922ac697d24271510ca206dad2aecb4d8b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Mar 2010 01:09:57 +0000 Subject: [PATCH] Fix: Export was broken after ODT support. --- htdocs/exports/export.php | 4 ++-- htdocs/includes/modules/export/modules_export.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 8fa513c114f..5524304bd93 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -758,7 +758,7 @@ if ($step == 4 && $datatoexport) if (! is_dir($conf->export->dir_temp)) create_exdir($conf->export->dir_temp); // Affiche liste des documents - // NB: La fonction show_documents rescanne les modules qd genallowed=1 + // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste $formfile->show_documents('export','',$conf->export->dir_temp.'/'.$user->id,$_SERVER["PHP_SELF"].'?step=4&datatoexport='.$datatoexport,$liste,1,(! empty($_POST['model'])?$_POST['model']:'csv'),'',1); print ' '; diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 38e3d42773e..f32917a4988 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -91,7 +91,7 @@ class ModeleExports } } - return array_keys($this->driverlabel); + return $this->driverlabel; }