From 5808bc5485ac98b967e5912db9cdde0cc2fb6ac0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 2 Nov 2009 11:46:43 +0100
Subject: [PATCH] Fixed ssues on the "Page locked" screen
Ignore-this: 9d142450d439f26feb5cc0aefb5963da
darcs-hash:20091102104643-6e07b-c26aa2fd5f3899e81b0e7e0e45b3c1d7043e8571.gz
---
inc/html.php | 2 +-
lib/scripts/edit.js | 1 +
lib/scripts/toolbar.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inc/html.php b/inc/html.php
index 1fb5b0202..0b6d01d72 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1218,7 +1218,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
$form->addElement(form_makeCloseTag('div'));
}
$form->addElement(form_makeCloseTag('div'));
- if($conf['license']){
+ if($wr && $conf['license']){
$form->addElement(form_makeOpenTag('div', array('class'=>'license')));
$out = $lang['licenseok'];
$out .= '<a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"';
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 11bf991fd..5c319cfb4 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -276,6 +276,7 @@ function changeCheck(msg){
function initChangeCheck(msg){
var edit_text = document.getElementById('wiki__text');
if(!edit_text) return;
+ if(edit_text.readOnly) return;
// add change check for links
var links = document.getElementsByTagName('a');
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 46f6ad789..eacfc7cad 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -15,7 +15,7 @@ function initToolbar(tbid,edid,tb){
if(!toolbar) return;
var edit = $(edid);
if(!edit) return;
- if(edit.readonly) return;
+ if(edit.readOnly) return;
//empty the toolbar area:
toolbar.innerHTML='';
--
GitLab