From 87a68af4c33ccb4c41cd8e664e06a6aa5ae60f26 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Mon, 3 Dec 2012 15:39:31 +0100
Subject: [PATCH 1/2] More redundant br elements fixed.
---
include/db/pdo-postgres.inc.php | 4 ++--
include/db/pdo-sqlite.inc.php | 4 ++--
include/db/postgres.inc.php | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/db/pdo-postgres.inc.php b/include/db/pdo-postgres.inc.php
index c413fbc0..5e735629 100644
--- a/include/db/pdo-postgres.inc.php
+++ b/include/db/pdo-postgres.inc.php
@@ -216,12 +216,12 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
if (!$serendipity['dbSth']) {
if (!$expectError && !$serendipity['production']) {
- print "Error in $sql<br/>\n";
+ print "<span class='msg_error'>Error in $sql</span>";
print $serendipity['dbConn']->errorInfo() . "<BR/>\n";
if (function_exists('debug_backtrace')) {
highlight_string(var_export(debug_backtrace(), 1));
}
- print "<br><code>$sql</code>\n";
+ print "<pre>$sql</pre>\n";
}
return $type_map['false'];
}
diff --git a/include/db/pdo-sqlite.inc.php b/include/db/pdo-sqlite.inc.php
index 3b6c860a..f8865332 100644
--- a/include/db/pdo-sqlite.inc.php
+++ b/include/db/pdo-sqlite.inc.php
@@ -234,12 +234,12 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
if (!$serendipity['dbSth']) {
if (!$expectError && !$serendipity['production']) {
- print "Error in $sql<br/>\n";
+ print "<span class='msg_error'>Error in $sql</span>";
print $serendipity['dbConn']->errorInfo() . "<BR/>\n";
if (function_exists('debug_backtrace')) {
highlight_string(var_export(debug_backtrace(), 1));
}
- print "<br><code>$sql</code>\n";
+ print "<pre>$sql</pre>";
}
return $type_map['false'];
}
diff --git a/include/db/postgres.inc.php b/include/db/postgres.inc.php
index da922706..f15e4062 100644
--- a/include/db/postgres.inc.php
+++ b/include/db/postgres.inc.php
@@ -226,12 +226,12 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
if (!$serendipity['dbLastResult']) {
if (!$expectError && !$serendipity['production']) {
- print "Error in $sql<br/>\n";
+ print "<span class='msg_error'>Error in $sql</span>";
print pg_last_error($serendipity['dbConn']) . "<BR/>\n";
if (function_exists('debug_backtrace')) {
highlight_string(var_export(debug_backtrace(), 1));
}
- print "<br><code>$sql</code>\n";
+ print "<pre>$sql</pre>";
}
return $type_map['false'];
}
From 78044113aa52e46849a428eda11585d8d42b455f Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Mon, 3 Dec 2012 15:40:51 +0100
Subject: [PATCH 2/2] More redundant br elements fixed.
---
serendipity_admin.php | 3 ---
1 file changed, 3 deletions(-)
diff --git a/serendipity_admin.php b/serendipity_admin.php
index 12a8926c..b8bf4e99 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -408,7 +408,6 @@ if ($use_installer) {
<?php } ?>
<li class="serendipitySideBarMenuFoot serendipitySideBarMenuMainLinks" style="display:none"></li>
</ul>
- <br class="serendipitySideBarMenuSpacer" />
<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
<ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
<li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks"><?php echo ADMIN_ENTRIES ?></li>
@@ -484,8 +483,6 @@ if ($use_installer) {
<li class="serendipitySideBarMenuFoot serendipitySideBarMenuUserManagement" style="display:none"></li>
</ul>
<?php } ?>
- <br class="serendipitySideBarMenuSpacer" />
-
<ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
<li class="serendipitySideBarMenuHead serendipitySideBarMenuLogoutLinks" style="display:none"></li>
<li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutWeblog"><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>