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

TB

Browse Source
This commit is contained in:
Garvin Hicking 2007-01-18 16:07:34 +00:00
parent f5597d0d6f
commit 1d08aa4633
2 changed files with 4 additions and 4 deletions

4
include/functions_installer.inc.php

@ -237,11 +237,11 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t
$path[] = '/usr/local/bin';
foreach ($path as $dir) {
if (!empty($dir) && (function_exists('is_executable') && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
if (!empty($dir) && (function_exists('is_executable') && is_readable($dir) && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
return $dir . '/convert';
}
if (!empty($dir) && (function_exists('is_executable') && @is_executable($dir . '/convert.exe')) || @is_file($dir . '/convert.exe')) {
if (!empty($dir) && (function_exists('is_executable') && is_readable($dir . '/convert') && @is_executable($dir . '/convert.exe')) || @is_file($dir . '/convert.exe')) {
return $dir . '/convert.exe';
}
}

4
include/functions_trackbacks.inc.php

@ -427,12 +427,12 @@ function serendipity_handle_references($id, $author, $title, $text, $dry_run = f
$old_references = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}references WHERE type = '' AND entry_id = " . (int)$id, false, 'assoc');
} else {
// A dry-run was called previously and restorable references are found. Restore them now.
serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE type = '' AND entry_id = " . (int)$entry['id']);
serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE type = '' AND entry_id = " . (int)$id);
if (is_array($old_references) && count($old_references) > 0) {
foreach($old_references AS $idx => $old_reference) {
$q = serendipity_db_insert('references', $old_reference, 'show');
echo serendipity_db_query($q);
serendipity_db_query($q);
}
}
}