[Phpgroupware-cvs] wiki/template common.php,1.9 history.php,1.4

[skwashd]

Update of wiki/template

Modified Files:
     Branch: MAIN
            common.php lines: +10 -4
            history.php lines: +3 -1

Log Message:
merge from 16

====================================================
Index: wiki/template/common.php
diff -u wiki/template/common.php:1.8 wiki/template/common.php:1.9
--- wiki/template/common.php:1.8        Thu Apr 17 13:19:45 2003
+++ wiki/template/common.php    Sun May 15 12:55:31 2005
@@ -84,9 +84,15 @@
        {
                if(!$args['nosearch'])
                {
-                       echo "<form method='get' action='$FindScript' 
name='thesearch'>
-                               <input type='hidden' name='action' 
value='find'/>
-                               <div class='form'>\n";
+                       echo '<form method="GET" action="' . $FindScript . '" 
name="thesearch">' . "\n";
+                       if(@constant('SID'))
+                       {
+                               echo '<input type="hidden" name="' . 
PHPGW_PHPSESSID . '" value="' . session_id().  '" />';
+                       }
+                               echo '<input type="hidden" name="sessionid" 
value="' . $GLOBALS['phpgw_info']['user']['sessionid'] . '" />'
+                                       . '<input type="hidden" name="kp3" 
value="' . $GLOBALS['phpgw_info']['user']['kp3'] . '" />'
+                                       . '<input type="hidden" name="action" 
value="find" />' . "\n"
+                                       . '<div class="form">' . "\n";
                }
                print html_toolbar_top();


====================================================
Index: wiki/template/history.php
diff -u wiki/template/history.php:1.3 wiki/template/history.php:1.4
--- wiki/template/history.php:1.3       Mon Mar  3 14:16:25 2003
+++ wiki/template/history.php   Sun May 15 12:55:31 2005
@@ -25,6 +25,8 @@
   <form method="get" action="<?php print $DiffScript; ?>">
   <div class="form">
     <input type="hidden" name="action" value="diff" />
+    <input type="hidden" name="sessionid" value="<?php echo 
$GLOBALS['phpgw_info']['user']['sessionid']; ?>" />
+    <input type="hidden" name="kp3" value="<?php echo 
$GLOBALS['phpgw_info']['user']['kp3']; ?>" />
     <input type="hidden" name="page" value="<?php print $args['page']; ?>" />
 <table border="0">
   <tr><td><strong>Older</strong></td>