summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorBen Coburn <btcoburn@silicodon.net>2006-05-26 16:49:58 +0200
committerBen Coburn <btcoburn@silicodon.net>2006-05-26 16:49:58 +0200
commit041d7a86fb8203c598f5311bcbc2ab4b7b5bb085 (patch)
tree74d72a741a71cf39a7fddb3628f0dd559555637a /inc
parent35dae8b08b9fb243b06bc972c20a0b00a8d97f0b (diff)
downloadrpg-041d7a86fb8203c598f5311bcbc2ab4b7b5bb085.tar.gz
rpg-041d7a86fb8203c598f5311bcbc2ab4b7b5bb085.tar.bz2
resolve darcs conflict 20060526
darcs-hash:20060526144958-05dcb-4e04cb5cc9d9f60180f867a12957ceda9ae963b4.gz
Diffstat (limited to 'inc')
-rw-r--r--inc/html.php6
1 files changed, 5 insertions, 1 deletions
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,'',