From e04d9617ed6361a3120fdaee16f46d1941aed591 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sat, 16 Jun 2001 19:39:33 +0000
Subject: [PATCH] Moving hook_after_navbar hook

---
 phpgwapi/inc/class.common.inc.php           | 1 -
 phpgwapi/templates/default/navbar.inc.php   | 4 +++-
 phpgwapi/templates/idsociety/navbar.inc.php | 4 +++-
 phpgwapi/templates/justweb/navbar.inc.php   | 4 +++-
 phpgwapi/templates/verdilak/navbar.inc.php  | 5 +++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index f5405a0c18..6941be8ad9 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -887,7 +887,6 @@
 				!$phpgw_info['flags']['navbar_target']))
 			{
 				echo parse_navbar();
-				$this->hook('after_navbar');
 			}
 		}
 
diff --git a/phpgwapi/templates/default/navbar.inc.php b/phpgwapi/templates/default/navbar.inc.php
index 8f5fd650fc..7c14e702eb 100644
--- a/phpgwapi/templates/default/navbar.inc.php
+++ b/phpgwapi/templates/default/navbar.inc.php
@@ -98,7 +98,9 @@
      {
 
      }
-     return $tpl->fp("out","navbar");
+	$tpl->pfp('out','navbar');
+	$phpgw->common->hook('after_navbar');
+	return;
   }
 
   function parse_navbar_end()
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 194e04c57c..08bdcda2d7 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -134,7 +134,9 @@
 		{
 		
 		}
-		return $tpl->fp('out','navbar');
+		$tpl->pfp('out','navbar');
+		$phpgw->common->hook('after_navbar');
+		return;
 	}
 
 	function parse_navbar_end()
diff --git a/phpgwapi/templates/justweb/navbar.inc.php b/phpgwapi/templates/justweb/navbar.inc.php
index 5b2e85df3e..8eb756e025 100644
--- a/phpgwapi/templates/justweb/navbar.inc.php
+++ b/phpgwapi/templates/justweb/navbar.inc.php
@@ -93,7 +93,9 @@
      if ($phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"]) {
 
      }
-     return $tpl->finish($tpl->parse("out","navbar"));
+	$tpl->pfp('out','navbar');
+	$phpgw->common->hook('after_navbar');
+	return;
   }
 
   function parse_navbar_end()
diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php
index ae43c34f32..4a22485c9f 100644
--- a/phpgwapi/templates/verdilak/navbar.inc.php
+++ b/phpgwapi/templates/verdilak/navbar.inc.php
@@ -118,8 +118,9 @@
 		{
 			$tpl->set_var('messages',$api_messages . '<br>' . checkcode($cd));
 		}
-
-		return $tpl->pfp('out','navbar');
+		$tpl->pfp('out','navbar');
+		$phpgw->common->hook('after_navbar');
+		return;
 	}
 
 	function parse_navbar_end()