Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Browse Source 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
This commit is contained in:
Laurent Destailleur
2019-06-02 12:36:07 +02:00
parent f2088a084f a20d824b97
commit 57cfb4b007
22 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/resource/class/html.formresource.class.php
View File

@@ -92,8 +92,6 @@ class FormResource
$out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
}
//$out.= '<input type="hidden" name="action" value="search">';
//$out.= '<input type="hidden" name="id" value="'.$theme->id.'">';
if ($resourcestat)
{