From 6d9eab4daacb2af47b0d8c19af63f9420d4c1ee1 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 24 Aug 2012 14:44:32 +0200
Subject: [PATCH] Prevent access to undefined variables and make returns
consistent in html.php
---
inc/html.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/inc/html.php b/inc/html.php
index af047a107..0a976e562 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -121,7 +121,7 @@ function html_secedit_get_button($data) {
global $ID;
global $INFO;
- if (!isset($data['name']) || $data['name'] === '') return;
+ if (!isset($data['name']) || $data['name'] === '') return '';
$name = $data['name'];
unset($data['name']);
@@ -718,6 +718,9 @@ function html_recent($first=0, $show_changes='both'){
$form->addElement($date);
$form->addElement(form_makeCloseTag('span'));
+ $diff = false;
+ $href = '';
+
if ($recent['media']) {
$diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && @file_exists(mediaFN($recent['id'])));
if ($diff) {
@@ -1116,7 +1119,7 @@ function html_diff($text='',$intro=true,$type=null){
$r_text = cleanText($text);
$r_head = $lang['yours'];
}else{
- if($rev1 && $rev2){ // two specific revisions wanted
+ if($rev1 && isset($rev2) && $rev2){ // two specific revisions wanted
// make sure order is correct (older on the left)
if($rev1 < $rev2){
$l_rev = $rev1;
--
GitLab