From 99c45080294b94ee89314423a800dc28c5df527a Mon Sep 17 00:00:00 2001 From: fmarcet Date: Mon, 27 Apr 2015 16:44:12 +0200 Subject: [PATCH 1/3] Fix: Bug in the new photo system --- htdocs/product/class/product.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index ac3d8e967a2..2ac3eed44ef 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3170,9 +3170,12 @@ class Product extends CommonObject function is_photo_available($sdir) { include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; + + global $conf; $dir = $sdir; - if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2) . $this->id ."/photos"; + if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2) . $this->id ."/photos/"; + else $dir .= '/'.dol_sanitizeFileName($this->ref).'/'; $nbphoto=0; From 93024830f519f72cbaf0ec7378af6a1554267846 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 27 Apr 2015 20:22:03 +0200 Subject: [PATCH 2/3] -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old instances -Update changelog for 3.7.1 --- ChangeLog | 6 ++++++ htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 10796fa9f34..fd88afc1c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,12 @@ Upgrading to any other version or database system is abolutely required BEFORE t make a migration. +***** ChangeLog for 3.7.1 compared to 3.7.* ***** +- Fix: Bug in the new photo system +- Fix: Error management +- Fix: [ Bug #2714 ] Members -> Memberxy-> Agenda -> technical Error +- Fix: [ Bug #2713 ] 3.7.0 mailing-unsubscribe.php not unsubscribe + ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: - New: Match other auth system: Login can be done entering login or user diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 6102997c3ad..b1104f98fde 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1175,4 +1175,6 @@ ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1); -ALTER TABLE llx_livraison MODIFY COLUMN date_delivery DATETIME NULL DEFAULT NULL; \ No newline at end of file +ALTER TABLE llx_livraison MODIFY COLUMN date_delivery DATETIME NULL DEFAULT NULL; + +INSERT INTO llx_const (name, value, type, note, visible, entity) values ('PRODUCT_USE_OLD_PATH_FOR_PHOTO','1','chaine','Use old path for products images',1,1); \ No newline at end of file From 6cfd8d64f5e04ca2558adc229bc8ce276f4cd3d1 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 27 Apr 2015 20:34:52 +0200 Subject: [PATCH 3/3] Change bugtracker to github in all maintened versions --- htdocs/main.inc.php | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 17395fd3de9..aec21cf4359 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1691,20 +1691,27 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me } // Link to bugtrack - if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) - { - require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) + { + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $bugbaseurl='https://doliforge.org/tracker/?'; - $bugbaseurl.='func=add&group_id=144&atid=246'; - $bugbaseurl.="&details="; - $bugbaseurl.=urlencode("\n\n\n\n\n-------------\n"); - $bugbaseurl.=urlencode($langs->trans("Version").": ".DOL_VERSION."\n"); - $bugbaseurl.=urlencode($langs->trans("Server").": ".$_SERVER["SERVER_SOFTWARE"]."\n"); - $bugbaseurl.=urlencode($langs->trans("PHP").": ".version_php()."\n"); - $bugbaseurl.=urlencode($langs->trans("Url").": ".$_SERVER["REQUEST_URI"]."\n"); - print ''; - } + $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new'; + $bugbaseurl.= '?title='; + $bugbaseurl.= urlencode("Bug: "); + $bugbaseurl.= '&body='; + $bugbaseurl.= urlencode("# Environment\n"); + $bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n"); + $bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n"); + $bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n"); + $bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n"); + $bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n"); + $bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n"); + $bugbaseurl.= urlencode("\n"); + $bugbaseurl.= urlencode("# Report\n"); + print '

'; + print ''.$langs->trans("FindBug").''; + print '

'; + } print "\n"; print "\n";