From 646b9fb3b8ae317d48772b3c81635a188e2e3cc6 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sat, 18 Jan 2020 15:15:50 +0100
Subject: Rev: 4592

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../modules/naplo/share/zaroJegyModifier.php       |  4 ++--
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 15 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'mayor-orig')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4591
+4592
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4591
+4592
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4591
+4592
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4591
+4592
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 8f22b44a..ecdf4f5b 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 @@
-4591
+4592
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4591
+4592
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 8f22b44a..ecdf4f5b 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 @@
-4591
+4592
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 8f22b44a..ecdf4f5b 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 @@
-4591
+4592
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 8f22b44a..ecdf4f5b 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 @@
-4591
+4592
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4591
+4592
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 e421af7f..d8c2fed7 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
@@ -97,7 +97,7 @@
 			    } else {
 				$q = "UPDATE zaroJegy SET modositasDt=NOW(),hivatalosDt='%s',diakId=%u,targyId=%u,evfolyam=%u,evfolyamJel='%s',felev=%u,
 				    jegy='%s',jegyTipus='%s',megjegyzes='%s' 
-				  WHERE zaroJegyId=%u AND (jegy!='%s' OR jegyTipus!='%s' OR megjegyzes!='%s')";
+				  WHERE zaroJegyId=%u AND (jegy!='%s' OR jegyTipus!='%s' OR megjegyzes!='%s' OR megjegyzes IS NULL)";
 			    }
                             $v[] = $J['zaroJegyId'];
                             $v[] = $J['jegy'];
@@ -115,7 +115,7 @@
                               VALUES (NOW(),'%s',%u,%u,%u,'%s',%u,'%s','%s','%s')";
 			}
                     }
-		$results[] = db_query($q, array('modul' => 'naplo_intezmeny','values' => $v, 'fv' => 'zaroJegyBeiras', 'result' => 'insert'), $lr);
+		$results[] = db_query($q, array('debug'=>true,'modul' => 'naplo_intezmeny','values' => $v, 'fv' => 'zaroJegyBeiras', 'result' => 'insert'), $lr);
 	    }
         }
 
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4591
+4592
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4591
+4592
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 562884a7..c3af7e67 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4591
-9a366c8c8de45ea7c4fb419ca79cf853  mayor-fenntarto-rev4591.tgz
-d300b9dae37607bc60f671953aa94f70  mayor-installer-sulix-rev4591.tgz
-445b9a99c2c2ccdc8cb3bb6a9010efb9  mayor-wiki-rev4591.tgz
-a420c108f29769690f396893b134e3a6  mayor-installer-rev4591.tgz
-4a0c27c98e511b507c4e3f98fc6147c5  mayor-portal-rev4591.tgz
-b5087703a3bef53b209ee026286b29b8  mayor-felveteli-rev4591.tgz
-6a0379bdd78d84a798afe9eaf5e3a921  mayor-jatek-rev4591.tgz
-4b7fc11d47cd25e118e2af56a4a7cf4a  mayor-locales-jp_JP-rev4591.tgz
-04736b40f2433e6d044bdecae4758e21  mayor-locales-de_DE-rev4591.tgz
-1d8449a5c92ea44dd23c5fa6dd01fa6b  mayor-locales-en_US-rev4591.tgz
-ef584fdf2d31bb98521dd5920bdcabdb  mayor-naplo-rev4591.tgz
-532879ef478566278eaf54dd3e00c159  mayor-base-rev4591.tgz
+Revision 4592
+41ffecc8ad8f08806ea3a52028987282  mayor-fenntarto-rev4592.tgz
+048210b7fbc3317d6707ff65942d5b1b  mayor-installer-sulix-rev4592.tgz
+77bc99e03c19c5c3c653a2a538e58c81  mayor-wiki-rev4592.tgz
+cc9fd89f53ca3a608b6e8d1abf10eccd  mayor-installer-rev4592.tgz
+eca03721e2d055631f2ed55e7cd0d629  mayor-portal-rev4592.tgz
+2966951d512293a38133a2f7bf923742  mayor-felveteli-rev4592.tgz
+11e7912432df9c3220bf01771d0fbecf  mayor-jatek-rev4592.tgz
+209c6bea1ed99dc77dfffa1cd702f3b0  mayor-locales-jp_JP-rev4592.tgz
+da0c9466c9d24d23d4607a5e8811070e  mayor-locales-de_DE-rev4592.tgz
+d0b0cf9b62020bfc0eb7637351a64518  mayor-locales-en_US-rev4592.tgz
+f8ced24c3be550f1d693a5b5951e9dc1  mayor-naplo-rev4592.tgz
+f3d8553181c533ceb03286995d36fa40  mayor-base-rev4592.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 8f22b44a..ecdf4f5b 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4591
+4592
-- 
cgit v1.2.3