[openmairie-framework-Commits] r4643 - openmairie_exemple/branches/4.9-extras/core

[lgro...@hephaestos.ovh.adullact.org]

Author: lgroleau
Date: 2020-09-14 09:55:11 +0200 (Mon, 14 Sep 2020)
New Revision: 4643

Modified:
openmairie_exemple/branches/4.9-extras/core/om_layout.class.php
openmairie_exemple/branches/4.9-extras/core/om_layout_jqueryui.class.php
openmairie_exemple/branches/4.9-extras/core/om_version.inc.php
Log:
rebase OM 4.9.8

Modified: openmairie_exemple/branches/4.9-extras/core/om_layout.class.php
===================================================================
--- openmairie_exemple/branches/4.9-extras/core/om_layout.class.php 2020-09-04 08:30:05 UTC (rev 4642)
+++ openmairie_exemple/branches/4.9-extras/core/om_layout.class.php 2020-09-14 07:55:11 UTC (rev 4643)
@@ -300,6 +300,7 @@
public function display() {
//
if ($this->get_parameter("flag") != "nohtml"
+ && $this->get_parameter("flag") != "login_and_nohtml"
&& $this->get_parameter("flag") != "login"
&& $this->get_parameter("flag") != "logout"
&& $this->get_parameter("flag") != "anonym") {

Modified: openmairie_exemple/branches/4.9-extras/core/om_layout_jqueryui.class.php
===================================================================
--- openmairie_exemple/branches/4.9-extras/core/om_layout_jqueryui.class.php 2020-09-04 08:30:05 UTC (rev 4642)
+++ openmairie_exemple/branches/4.9-extras/core/om_layout_jqueryui.class.php 2020-09-14 07:55:11 UTC (rev 4643)
@@ -116,6 +116,7 @@
if ($this->get_parameter("flag") == "htmlonly"
|| $this->get_parameter("flag") == "htmlonly_nodoctype"
|| $this->get_parameter("flag") == "nohtml"
+ || $this->get_parameter("flag") == "login_and_nohtml"
|| count($this->get_parameter("menu")) == 0) {
echo " nomenu";
}

Modified: openmairie_exemple/branches/4.9-extras/core/om_version.inc.php
===================================================================
--- openmairie_exemple/branches/4.9-extras/core/om_version.inc.php 2020-09-04 08:30:05 UTC (rev 4642)
+++ openmairie_exemple/branches/4.9-extras/core/om_version.inc.php 2020-09-14 07:55:11 UTC (rev 4643)
@@ -9,4 +9,4 @@
/**
*
*/
-$version = "4.9.7-extra-1.0.5";
+$version = "4.9.8-extra-1.0.6";