hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge 3.8

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-12-09 14:01:00 +01:00
parent 9f38823f27
commit 589169299c
29 changed files with 430 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/module/report/sqlconnexion.php
View File

@@ -89,12 +89,6 @@ class module_report_sqlconnexion extends module_report_sql implements module_rep
WHERE (' . $filter['sql'] . ')
) AS tt ORDER BY val ASC';
<<<<<<< HEAD
return ['sql' => $this->sql, 'params' => $this->params];
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
return array('sql' => $this->sql, 'params' => $this->params);
>>>>>>> 3.8
}
}