1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00

Merge branch 'master' into 2.4.2

This commit is contained in:
Thomas Zilio
2018-08-29 18:15:12 +02:00
31 changed files with 263 additions and 133 deletions

View File

@ -170,15 +170,11 @@ if (!empty($result_query) && $result_query != 'menu' && $result_query != 'custom
// Icona di stampa
elseif ($field == '_print_') {
$print_url = $r['_print_'];
$print = $r['_print_'];
preg_match_all('/\$(.+?)\$/', $print_url, $matches);
$print_url = Prints::getHref($print, $r['id']);
for ($m = 0; $m < sizeof($matches[0]); ++$m) {
$print_url = str_replace($matches[0][$m], $r[$matches[1][$m]], $print_url);
}
$value = '<a href="'.$rootdir.'/'.$print_url.'" target="_blank"><i class="fa fa-2x fa-print"></i></a>';
$value = '<a href="'.$print_url.'" target="_blank"><i class="fa fa-2x fa-print"></i></a>';
}
// Icona