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

Remove errenous commit

Browse Source
This commit is contained in:
Garvin Hicking
2006-11-14 10:02:28 +00:00
parent 233195680f
commit d9d2317f23
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions_images.inc.php
View File

@@ -610,7 +610,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
$infile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $file;
echo 'From: ' . $infile . '<br />';
# echo 'From: ' . $infile . '<br />';
if ($is_temporary) {
$temppath = dirname($thumbname);
if (!is_dir($temppath)) {
@@ -621,7 +621,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
$outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $thumbname . '.' . $suf;
}
$serendipity['last_outfile'] = $outfile;
echo 'To: ' . $outfile . '<br />';
# echo 'To: ' . $outfile . '<br />';
$fdim = @serendipity_getimagesize($infile, '', $suf);
if (isset($fdim['noimage'])) {

15
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
View File

@@ -93,12 +93,12 @@ class serendipity_event_nl2br extends serendipity_event
if($regexp) return preg_replace_callback($regexp, array($this, 'isolate'), $src);
global $_buf;
$_buf[] = $src[0];
return "\\001" . (count($_buf) - 1);
return "\001" . (count($_buf) - 1);
}
function restore($text) {
global $_buf;
return preg_replace('~\\001(\\d+)~e', '$_buf[$1]', $text);
return preg_replace('~\001(\d+)~e', '$_buf[$1]', $text);
}
function event_hook($event, &$bag, &$eventData) {
@@ -135,11 +135,11 @@ class serendipity_event_nl2br extends serendipity_event
$element = $temp['element'];
if ($isolate) {
$eventData[$element] = $this->isolate($eventData[$element], '~[<\\[](' . implode('|', $isolate) . ').*?[>\\]].*?[<\\[]/\\1[>\\]]~si');
}
$eventData[$element] = nl2br($eventData[$element]);
if ($isolate) {
$eventData[$element] = $this->restore($eventData[$element]);
$eventData[$element] = $this->isolate($eventData[$element], '~[<\[](' . implode('|', $isolate) . ').*?[>\]].*?[<\[]/\1[>\]]~si');
$eventData[$element] = nl2br($eventData[$element]);
$eventData[$element] = $this->restore($eventData[$element]);
} else {
$eventData[$element] = nl2br($eventData[$element]);
}
}
}
@@ -157,4 +157,3 @@ class serendipity_event_nl2br extends serendipity_event
}
/* vim: set sts=4 ts=4 expandtab : */
?>

2
templates/default/admin/media_upload.tpl
View File

@@ -170,7 +170,7 @@ function fillInput(source, target) {ldelim}
{rdelim}
</script>
<form target="_blank" action="?" method="POST" id="uploadform" enctype="multipart/form-data" onsubmit="rememberOptions()">
<form action="?" method="POST" id="uploadform" enctype="multipart/form-data" onsubmit="rememberOptions()">
<div>
{if $media.max_file_size}
<input type="hidden" name="MAX_FILE_SIZE" value="{$max_file_size}" />