From f4104f779f9ce9a44b6cc717ab31e4f4b0d507b6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 19 Feb 2012 17:04:02 +0100 Subject: [PATCH 1/2] Fix: merge manually grandoc corrections --- htdocs/main.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4c4f365b554..5a49f7442be 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -609,7 +609,7 @@ if (! defined('NOLOGIN')) } /* - * Overwrite configs global by peronal configs + * Overwrite configs global by personal configs */ // Set liste_limit if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) // Can be 0 @@ -627,7 +627,7 @@ if (! defined('NOLOGIN')) $conf->css = "/theme/".$conf->theme."/style.css.php"; } - // If theme support optim like flip-hide left menu and we use a smartphone, we force it + // If theme support option like flip-hide left menu and we use a smartphone, we force it if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; // Set javascript option From 95f9de6ab4ebbcc04a13730744e62f0041368c2c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 19 Feb 2012 18:00:47 +0100 Subject: [PATCH 2/2] Fix: missing rowid --- htdocs/compta/facture.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 80803d6d714..54e03b64127 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -141,8 +141,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture-> { if ($user->rights->facture->supprimer) { - $result = $object->fetch($id); - $result = $object->delete(); + $result = $object->delete($id); if ($result > 0) { Header('Location: '.$_SERVER["PHP_SELF"]);