mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Ian
2012-12-03 16:27:06 +01:00
parent 1f9ed0fa2a 78044113aa
commit 6998d1eed1
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/db/pdo-postgres.inc.php
View File

@ -216,12 +216,12 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
if (!$serendipity['dbSth']) { if (!$serendipity['dbSth']) {
if (!$expectError && !$serendipity['production']) { 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"; print $serendipity['dbConn']->errorInfo() . "<BR/>\n";
if (function_exists('debug_backtrace')) { if (function_exists('debug_backtrace')) {
highlight_string(var_export(debug_backtrace(), 1)); highlight_string(var_export(debug_backtrace(), 1));
} }
print "<br><code>$sql</code>\n"; print "<pre>$sql</pre>\n";
} }
return $type_map['false']; return $type_map['false'];
} }

4
include/db/pdo-sqlite.inc.php
View File

@ -234,12 +234,12 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
if (!$serendipity['dbSth']) { if (!$serendipity['dbSth']) {
if (!$expectError && !$serendipity['production']) { 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"; print $serendipity['dbConn']->errorInfo() . "<BR/>\n";
if (function_exists('debug_backtrace')) { if (function_exists('debug_backtrace')) {
highlight_string(var_export(debug_backtrace(), 1)); highlight_string(var_export(debug_backtrace(), 1));
} }
print "<br><code>$sql</code>\n"; print "<pre>$sql</pre>";
} }
return $type_map['false']; return $type_map['false'];
} }

4
include/db/postgres.inc.php
View File

@ -226,12 +226,12 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
if (!$serendipity['dbLastResult']) { if (!$serendipity['dbLastResult']) {
if (!$expectError && !$serendipity['production']) { 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"; print pg_last_error($serendipity['dbConn']) . "<BR/>\n";
if (function_exists('debug_backtrace')) { if (function_exists('debug_backtrace')) {
highlight_string(var_export(debug_backtrace(), 1)); highlight_string(var_export(debug_backtrace(), 1));
} }
print "<br><code>$sql</code>\n"; print "<pre>$sql</pre>";
} }
return $type_map['false']; return $type_map['false'];
} }

3
serendipity_admin.php
View File

@ -408,7 +408,6 @@ if ($use_installer) {
<?php } ?> <?php } ?>
<li class="serendipitySideBarMenuFoot serendipitySideBarMenuMainLinks" style="display:none"></li> <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMainLinks" style="display:none"></li>
</ul> </ul>
<br class="serendipitySideBarMenuSpacer" />
<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?> <?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
<ul class="serendipitySideBarMenu serendipitySideBarMenuEntry"> <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
<li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks"><?php echo ADMIN_ENTRIES ?></li> <li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks"><?php echo ADMIN_ENTRIES ?></li>
@ -484,8 +483,6 @@ if ($use_installer) {
<li class="serendipitySideBarMenuFoot serendipitySideBarMenuUserManagement" style="display:none"></li> <li class="serendipitySideBarMenuFoot serendipitySideBarMenuUserManagement" style="display:none"></li>
</ul> </ul>
<?php } ?> <?php } ?>
<br class="serendipitySideBarMenuSpacer" />
<ul class="serendipitySideBarMenu serendipitySideBarMenuLogout"> <ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
<li class="serendipitySideBarMenuHead serendipitySideBarMenuLogoutLinks" style="display:none"></li> <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> <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutWeblog"><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>