From 041d7a86fb8203c598f5311bcbc2ab4b7b5bb085 Mon Sep 17 00:00:00 2001
From: Ben Coburn <btcoburn@silicodon.net>
Date: Fri, 26 May 2006 16:49:58 +0200
Subject: [PATCH] resolve darcs conflict 20060526

darcs-hash:20060526144958-05dcb-4e04cb5cc9d9f60180f867a12957ceda9ae963b4.gz
---
 inc/html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/html.php b/inc/html.php
index 09e871b67..1bce0210e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -136,7 +136,11 @@ function html_editbutton(){
  */
 function html_secedit_button($matches){
   global $ID;
-  global $lang;
+  global $INFO;
+
+  $section = $matches[2];
+  $name = $matches[1];
+
   $secedit  = '';
   $secedit .= '<div class="secedit">';
   $secedit .= html_btn('secedit',$ID,'',
-- 
GitLab