tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '493-fallan-los-adjuntos-de-graficas-en-los-envios-de-mail-de-alerta-open' into 'develop' 

493 fallan los adjuntos de graficas en los envios de mail de alerta open

See merge request !248
This commit is contained in:
daniel 2017-03-13 14:03:12 +01:00
parent 8d1e8cf49a 5872cd1f49
commit 4e18b82165
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/install.php
View File

@ -228,7 +228,7 @@ function parse_mysql_dump($url) {
$file_content = file($url); $file_content = file($url);
$query = ""; $query = "";
foreach($file_content as $sql_line) { foreach($file_content as $sql_line) {
if (trim($sql_line) != "" && strpos($sql_line, "--") === false) { if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) {
$query .= $sql_line; $query .= $sql_line;
if(preg_match("/;[\040]*\$/", $sql_line)) { if(preg_match("/;[\040]*\$/", $sql_line)) {
if (!$result = mysql_query($query)) { if (!$result = mysql_query($query)) {
@ -251,7 +251,7 @@ function parse_mysqli_dump($connection, $url) {
$file_content = file($url); $file_content = file($url);
$query = ""; $query = "";
foreach($file_content as $sql_line) { foreach($file_content as $sql_line) {
if (trim($sql_line) != "" && strpos($sql_line, "--") === false) { if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) {
$query .= $sql_line; $query .= $sql_line;
if(preg_match("/;[\040]*\$/", $sql_line)) { if(preg_match("/;[\040]*\$/", $sql_line)) {
if (!$result = mysqli_query($connection, $query)) { if (!$result = mysqli_query($connection, $query)) {

15
pandora_console/pandoradb_data.sql
View File

File diff suppressed because one or more lines are too long