# HG changeset patch
# User Dan
# Date 1184182561 14400
# Node ID 52017732bc2030c093e678a1edb48fb0a9bc2fc8
# Parent  627d0a8a7819941d48186c6c244d86c632e24a6f
Added "raw" option to embedded images to make complex clickables easier

diff -r 627d0a8a7819 -r 52017732bc20 includes/render.php
--- a/includes/render.php	Wed Jul 11 15:18:14 2007 -0400
+++ b/includes/render.php	Wed Jul 11 15:36:01 2007 -0400
@@ -243,7 +243,8 @@
     if ( !$plaintext )
     {
       // Process images
-      $text = RenderMan::process_image_tags($text, $taglist);
+      $text   = RenderMan::process_image_tags($text, $taglist);
+      $text = RenderMan::process_imgtags_stage2($text, $taglist);
     }
     
     if($do_params)
@@ -280,10 +281,10 @@
       $result = $wiki->transform($text, 'Xhtml');
     }
     
-    if ( !$plaintext )
-    {
-      $result = RenderMan::process_imgtags_stage2($result, $taglist);
-    }
+    // if ( !$plaintext )
+    // {
+    //   $result = RenderMan::process_imgtags_stage2($result, $taglist);
+    // }
     
     // Reinsert <nowiki> sections
     for($i=0;$i<$nw;$i++)
@@ -775,7 +776,7 @@
     $taglist = array();
     
     // Wicked huh?
-    $regex = '/\[\[:' . $paths->nslist['File'] . '([\w\s0-9_\(\)!@%\^\+\|\.-]+?)((\|thumb)|(\|([0-9]+)x([0-9]+)))?(\|left|\|right)?(\|(.+))?\]\]/i';
+    $regex = '/\[\[:' . $paths->nslist['File'] . '([\w\s0-9_\(\)!@%\^\+\|\.-]+?)((\|thumb)|(\|([0-9]+)x([0-9]+)))?(\|left|\|right)?(\|raw|\|(.+))?\]\]/i';
     
     preg_match_all($regex, $text, $matches);
     
@@ -792,6 +793,7 @@
       
       if ( !isPage( $paths->nslist['File'] . $filename ) )
       {
+        $text = str_replace($full_tag, '[[' . makeUrlNS('File', $filename) . ']]', $text);
         continue;
       }
       
@@ -818,16 +820,16 @@
       
       // if ( isset($r_width) && isset($r_height) && $scale_type != '|thumb' )
       // {
-      // $img_tag .= 'width="' . $r_width . '" height="' . $r_height . '" ';
+      //   $img_tag .= 'width="' . $r_width . '" height="' . $r_height . '" ';
       // }
       
-      $img_tag .= 'style="border-width: 0px; background-color: white;" ';
+      $img_tag .= 'style="border-width: 0px; /* background-color: white; */" ';
       
       $img_tag .= '/>';
       
       $complete_tag = '';
       
-      if ( !empty($scale_type) )
+      if ( !empty($scale_type) && $caption != '|raw' )
       {
         $complete_tag .= '<div class="thumbnail" ';
         $clear_text = '';
@@ -854,6 +856,10 @@
         
         $complete_tag .= '</div>';
       }
+      else if ( $caption == '|raw' )
+      {
+        $complete_tag .= $img_tag;
+      }
       else
       {
         $complete_tag .= '<a href="' . makeUrlNS('File', $filename) . '" style="display: block;">';