aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-04-03 22:00:03 +0200
committerM.Gergo2020-04-03 22:00:03 +0200
commitf140bf024b58d159d37a1cf73735cb6afa6da3f3 (patch)
treee0495a08910879d409c68aa766d6b7e10162212f
parent47ee90f56d46edd6d33620b562f719b0a1601df7 (diff)
downloadmayor-f140bf024b58d159d37a1cf73735cb6afa6da3f3.tar.gz
mayor-f140bf024b58d159d37a1cf73735cb6afa6da3f3.zip
Rev: 4648rev4648
Diffstat
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-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/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml5
-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
16 files changed, 30 insertions, 29 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index 1587f3b0..ffe8a4dd 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -218,16 +218,17 @@ echo '<style type="text/css">
/* kiegészítjük a tankörnévsort az egyéb diákokkal, akik látták ezt a házifeladatot */
for ($i=0; $i<count($ADAT['hazifeladatDiak']); $i++) {
+ $_diakId = $ADAT['hazifeladatDiak'][$i]['diakId'];
if (!is_array($ADAT['nevsor']['nevek'][$_diakId])) {
$EXTRA = $ADAT['hazifeladatDiak'][$i];
- $ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>true);
+ $ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>'add');
}
}
if (is_array($ADAT['nevsor']['nevek']))
foreach ($ADAT['nevsor']['nevek'] as $diakId => $ITEM) {
$D = $DIAKHF[$diakId];
- $_extraClass = ($ITEM['extra']===true) ? 'extraDiak':'';
+ $_extraClass = ($ITEM['extra']=='add') ? 'extraDiak':'';
echo '<tr>';
echo '<td class="diakNev diakAdat '.$_extraClass.'" data-diakid="'.$diakId.'">'.$ITEM['diakNev'].'</td>';
if (__NAPLOADMIN===true || __VEZETOSEG===true) echo '<td>'.$D['diakLattamDt'].'</td>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 510e0f39..84dbf239 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4647
-28aae561159bae08231a8bdfa1adc4a8 mayor-fenntarto-rev4647.tgz
-af5371068e83f16a2dea96e40091bd09 mayor-installer-sulix-rev4647.tgz
-7f6ea900870b41377e0778eb63b3764b mayor-wiki-rev4647.tgz
-958f4377fd5022bfca21b8bdf22463ce mayor-installer-rev4647.tgz
-cc283744cff986ac603ab6a198c25616 mayor-portal-rev4647.tgz
-61028a9de8e0a140d54361e1dc2f5350 mayor-felveteli-rev4647.tgz
-c6e5dbb918a83ba781baecf75093fd9d mayor-jatek-rev4647.tgz
-b41417771784a8e5b7e1176e9aefd12a mayor-locales-jp_JP-rev4647.tgz
-2c0559fb53df9016aed0d03d2beefef8 mayor-locales-de_DE-rev4647.tgz
-0e5a86267c135b6688fc0525d2b4d371 mayor-locales-en_US-rev4647.tgz
-04fc8fa70dacda0658c6c93e224311cd mayor-naplo-rev4647.tgz
-219bac9fe1d4269ad176aee6be56629d mayor-base-rev4647.tgz
+Revision 4648
+d086af10898e4db86ad58a6f6a8cb9e1 mayor-fenntarto-rev4648.tgz
+68a39470addacc9872dfa0b78e77f505 mayor-installer-sulix-rev4648.tgz
+8e32bd80c182fd8edc2205fb695162ac mayor-wiki-rev4648.tgz
+7ff385259871d1e1de7be26631713fe1 mayor-installer-rev4648.tgz
+967b10bb174eb12bb916101dfed22e5e mayor-portal-rev4648.tgz
+e0cf0c0cd9a42caedebba2b088254ef5 mayor-felveteli-rev4648.tgz
+542c478343092580f6bc08cef4e61a44 mayor-jatek-rev4648.tgz
+02f71a4be04a6c451117f4f72db05567 mayor-locales-jp_JP-rev4648.tgz
+40130350f09899f27b7ed0a03a1697fd mayor-locales-de_DE-rev4648.tgz
+b9ffaed9f2964c007bcfaed56332c7d1 mayor-locales-en_US-rev4648.tgz
+7e1f7b7eb79e843e902e89785cc564e4 mayor-naplo-rev4648.tgz
+e8f59df1952886bfbc3beef2dcdc3564 mayor-base-rev4648.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 209cee31..31e10e49 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4647
+4648
diff --git a/rev.txt b/rev.txt
index 209cee31..31e10e49 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4647
+4648
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 02:36:58 +0000