Remove errenous commit

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 98eb861fe8a81f9a9dc29ed9bf45b30f1422f414..420962dedc81734d6b18aeeaa92f0a26e0c8c037 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -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'])) {

diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
index 8fe2e0111cd33ff8894e4394651df529741fafcc..c3ef4fbd1f73eb56e9f431845338d07bb4a9ab8d 100644 (file)
--- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
+++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
@@ -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 : */
-?>
\ No newline at end of file

diff --git a/templates/default/admin/media_upload.tpl b/templates/default/admin/media_upload.tpl
index 99fcd6d13427522bdaf82d205c53bd14874a3686..6ef3c719464a812ad4c9c0e3b00034c2436388cc 100644 (file)
--- a/templates/default/admin/media_upload.tpl
+++ b/templates/default/admin/media_upload.tpl
@@ -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}" />