From 6329344df267879a137bf8ab2cabedb84a437139 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 22 Oct 2012 09:15:08 +0200 Subject: [PATCH] Fix: broken features Fix: use entity O for all entities --- htdocs/core/lib/admin.lib.php | 2 +- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index eaa173eb6fe..b82387310b7 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -254,7 +254,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker dol_syslog('Admin.lib::run_sql Request '.($i+1).' sql='.$newsql, LOG_DEBUG); // Replace for encrypt data - if (preg_match_all('/__ENCRYPT\(\'([A-Za-z0-9_]+)\'\)__/i',$newsql,$reg)) + if (preg_match_all('/__ENCRYPT\(\'([A-Za-z0-9_\"\[\]]+)\'\)__/i',$newsql,$reg)) { $num=count($reg[0]); diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index fa1989522c9..0ad962745b5 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -761,7 +761,8 @@ UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps ALTER TABLE llx_user ADD COLUMN job varchar(128) AFTER firstname; -INSERT INTO llx_const(name, entity, value) SELECT 'SYSLOG_HANDLERS', 1, '["mod_syslog_file"]' FROM llx_const WHERE name = 'SYSLOG_FILE_ON' and value = '1'; +-- Use entity 0 for all entities +INSERT INTO llx_const(name, entity, value) SELECT __ENCRYPT('SYSLOG_HANDLERS')__, 0, __ENCRYPT('["mod_syslog_file"]')__ FROM llx_const WHERE __DECRYPT('name')__ = 'SYSLOG_FILE_ON' AND __DECRYPT('value')__ = '1'; -- New Imports