Skip to content
Snippets Groups Projects
Commit 258ec3e2 authored by alvaro's avatar alvaro
Browse files

Merge remote-tracking branch 'upstream/master'

parents a20efebc 014b7741
No related branches found
No related tags found
No related merge requests found
......@@ -543,7 +543,9 @@ class Utils{
if(isset($lodspkData['params'])){
$lodspk['this']['params'] = $lodspkData['params'];
}
$lodspk['queryTimes'] = Convert::array_to_object($lodspk['queryTimes']);
if(isset($lodspk['queryTimes'])){
$lodspk['queryTimes'] = Convert::array_to_object($lodspk['queryTimes']);
}
require_once($conf['home'].'lib/Haanga/lib/Haanga.php');
$viewAux = explode("/",$view);
$viewFile = array_pop($viewAux);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment