Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-10-01 16:35:39 +02:00
commit d32ded9f5e
1 changed files with 5 additions and 1 deletions

View File

@ -133,10 +133,14 @@ class PageController extends Controller
$user.=$data->getUser()->getUsername(); $user.=$data->getUser()->getUsername();
} }
$icon="";
if($data->getFonticon())
$icon.="<i class='".$data->getFonticon()." fa-fw'></i>&nbsp;";
array_push($output["data"],[ array_push($output["data"],[
$action, $action,
$data->getRoworder(), $data->getRoworder(),
$data->getName(), $icon.$data->getName(),
$data->getPagecategory()->getName(), $data->getPagecategory()->getName(),
$user $user
]); ]);