aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-01-22 19:03:09 +0100
committerM.Gergo2020-01-22 19:03:09 +0100
commit2116314871e4f4bbcb5aea67c455b87595f8e9da (patch)
treeb1d42da30332283a23576cd6aa94fa3b187ceebe
parent967e12bd9c87a8ec56f6a48d9ef46543a29ba99a (diff)
downloadmayor-2116314871e4f4bbcb5aea67c455b87595f8e9da.tar.gz
mayor-2116314871e4f4bbcb5aea67c455b87595f8e9da.zip
Rev: 4599rev4599
Diffstat
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-base/www/include/base/mysql.php11
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaroJegyModifier.php3
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
17 files changed, 35 insertions, 33 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-base/www/include/base/mysql.php b/mayor-orig/mayor-base/www/include/base/mysql.php
index 4bc49d16..e5e4a2e3 100644
--- a/mayor-orig/mayor-base/www/include/base/mysql.php
+++ b/mayor-orig/mayor-base/www/include/base/mysql.php
@@ -193,10 +193,13 @@
) $_SESSION['alert'][] = 'message:lehet hiba?:db_query/'.$SET['fv'].':'.$SET['modul'].':'.$q_pattern;
if ($SET['log']===true) mayorLogger(10,'mysql',$q,_USERACCOUNT);
- if (MYSQLI_ENABLED===true)
+ if (MYSQLI_ENABLED===true) {
$r = mysqli_query($lr,$q);
- else
+ $_insert_id = mysqli_insert_id($lr); // itt lekérdezzük, hogy a warning lekérdezés ne rontsa el debug=true esetén!!
+ } else {
$r = @mysql_query($q, $lr);
+ $_insert_id = mysql_insert_id($lr);
+ }
define(MYSQL_LOGGER,false);
if (MYSQL_LOGGER === true) {
$filename = '/tmp/mysql.log';
@@ -283,7 +286,7 @@
break;
}
} elseif ($SET['result'] == 'insert' && (substr(strtolower($q),0,6) == 'insert' || substr(strtolower($q),0,7) == 'replace')) {
- $RESULT = mysqli_insert_id($lr);
+ $RESULT = $_insert_id; // mysqli_insert_id($lr); - ez itt már elromlik debug=true esetén a warning lekérdezés miatt
mayorLogger(1,'mysql',$q,_USERACCOUNT);
} elseif ($SET['result'] == 'affected rows') {
$RESULT = mysqli_affected_rows($lr);
@@ -327,7 +330,7 @@
break;
}
} elseif ($SET['result'] == 'insert' && (substr(strtolower($q),0,6) == 'insert' || substr(strtolower($q),0,7) == 'replace')) {
- $RESULT = mysql_insert_id($lr);
+ $RESULT = $_insert_id; // mysql_insert_id($lr); - ez itt már elromlik debug=true esetén a warning lekérdezés miatt
mayorLogger(1,'mysql',$q,_USERACCOUNT);
} elseif ($SET['result'] == 'affected rows') {
$RESULT = mysql_affected_rows($lr);
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaroJegyModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaroJegyModifier.php
index d8c2fed7..cd00612e 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaroJegyModifier.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaroJegyModifier.php
@@ -115,12 +115,11 @@
VALUES (NOW(),'%s',%u,%u,%u,'%s',%u,'%s','%s','%s')";
}
}
- $results[] = db_query($q, array('debug'=>true,'modul' => 'naplo_intezmeny','values' => $v, 'fv' => 'zaroJegyBeiras', 'result' => 'insert'), $lr);
+ $results[] = db_query($q, array('modul' => 'naplo_intezmeny','values' => $v, 'fv' => 'zaroJegyBeiras', 'result' => 'insert'), $lr);
}
}
if ($olr=='') db_close($lr); //+++ MISSING hibakezelés, tranzakciókezelés???
-
if (is_array($results) && count($results) == 1) return $results[0]; // vizsga oldal használja lastInsertId miatt
else return false;
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4593
+4599
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 9f54acde..5a751e35 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4593
-61e2b1ec4514fa02270a629b7c3ed087 mayor-fenntarto-rev4593.tgz
-fb724d369c4ad255fff0d47d34224b73 mayor-installer-sulix-rev4593.tgz
-ecb84aeb338c3aa6ccf6b49754db833a mayor-wiki-rev4593.tgz
-01a72a7186f474c5aa3688140254fb75 mayor-installer-rev4593.tgz
-f4e73b9244beb65c50c48a8a70121047 mayor-portal-rev4593.tgz
-1f4febe05ec2ffa802aaa0218a68c5a5 mayor-felveteli-rev4593.tgz
-8d787c25d0bc55712483c77948ff87f9 mayor-jatek-rev4593.tgz
-4ab8c764519735f8a4a96c3954e7cac0 mayor-locales-jp_JP-rev4593.tgz
-f6d70bd890a5449d9d291de645d702be mayor-locales-de_DE-rev4593.tgz
-bc198272d29a072887fa82de0d94cc26 mayor-locales-en_US-rev4593.tgz
-4b9f35afa511c7f0290ac8acab5b613d mayor-naplo-rev4593.tgz
-43ffcae2d576c85bb48dbe66b01b7513 mayor-base-rev4593.tgz
+Revision 4599
+ebdc452823025a40d8dd138129000919 mayor-fenntarto-rev4599.tgz
+16ceb458b7b41a92aa5a6a41816a10db mayor-installer-sulix-rev4599.tgz
+fa8fc67f1ae0df1e8e38d505593db1c5 mayor-wiki-rev4599.tgz
+df919d2c2c55e593bb625449d5eecaca mayor-installer-rev4599.tgz
+4951adc4f13981211dbee1b9ce76f5cb mayor-portal-rev4599.tgz
+bb21bb5733dac87817bb81df70f3a4f3 mayor-felveteli-rev4599.tgz
+00d295e53848a9dd821a7b2bf95e5463 mayor-jatek-rev4599.tgz
+dc3b60b62e13aec2c9e7f0d2f5092a2b mayor-locales-jp_JP-rev4599.tgz
+fa2c06d8035293f86e1973a001754e23 mayor-locales-de_DE-rev4599.tgz
+6df40f0c2224ee8a14746ecfc7e643f9 mayor-locales-en_US-rev4599.tgz
+33c7e7350687d860e687ed24d763cb51 mayor-naplo-rev4599.tgz
+29a6f77ec33b12743c6b494261565050 mayor-base-rev4599.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index b2b76036..61a4c0c1 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4593
+4599
diff --git a/rev.txt b/rev.txt
index b2b76036..61a4c0c1 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4593
+4599
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 22:17:42 +0000