[xoops-svn] SF.net SVN: xoops-svn:[10326] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<du...@us...>]

Revision: 10326
          http://sourceforge.net/p/xoops/svn/10326
Author:   dugris
Date:     2012-12-06 04:04:15 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
replace $form->render() with $form->display()

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php	2012-12-06 02:19:25 UTC (rev 10325)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php	2012-12-06 04:04:15 UTC (rev 10326)
@@ -236,7 +236,7 @@
     if ($xoopsConfigUser['allow_chgmail'] == 1) {
         $form->setRequired($email_text);
     }
-    $form->render(false);
+    $form->display();
     $xoops->footer();
 }
 
@@ -260,7 +260,7 @@
         $form->addElement(new XoopsFormHidden('op', 'avatarupload'));
         $form->addElement(new XoopsFormHidden('uid', $xoops->user->getVar('uid')));
         $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $form->render(false);
+        $form->display();
     }
     $avatar_handler = $xoops->getHandlerAvatar();
     $form2 = new XoopsThemeForm(_US_CHOOSEAVT, 'uploadavatar', 'edituser.php', 'post', true);
@@ -278,7 +278,7 @@
     $form2->addElement(new XoopsFormHidden('uid', $xoops->user->getVar('uid')));
     $form2->addElement(new XoopsFormHidden('op', 'avatarchoose'));
     $form2->addElement(new XoopsFormButton('', 'submit2', _SUBMIT, 'submit'));
-    $form2->render(false);
+    $form2->display();
     $xoops->footer();
 }
 

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html	2012-12-06 02:19:25 UTC (rev 10325)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_search.html	2012-12-06 04:04:15 UTC (rev 10326)
@@ -76,7 +76,4 @@
             <{$smarty.const._SR_NOMATCH}>
         </div>
     <{/if}>
-</fieldset>
-
-<!-- Display form -->
-<{includeq file="module:system|system_form.html"}>
+</fieldset>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php	2012-12-06 02:19:25 UTC (rev 10325)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php	2012-12-06 04:04:15 UTC (rev 10326)
@@ -82,7 +82,7 @@
         } else {
             echo "<span class='red'>$stop</span>";
             include $xoops->path('include/registerform.php');
-            $reg_form->render(false);
+            $reg_form->display();
         }
         $xoops->footer();
         break;
@@ -188,7 +188,7 @@
         } else {
             echo "<span class='red bold'>{$stop}</span>";
             include $xoops->path('include/registerform.php');
-            $reg_form->render(false);
+            $reg_form->display();
         }
         $xoops->footer();
         break;
@@ -250,7 +250,7 @@
         $xoops->theme->addMeta('meta', 'keywords', _US_USERREG . ", " . _US_NICKNAME); // FIXME!
         $xoops->theme->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
         include $xoops->path('include/registerform.php');
-        $reg_form->render(false);
+        $reg_form->display();
         $xoops->footer();
         break;
 }
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php	2012-12-06 02:19:25 UTC (rev 10325)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php	2012-12-06 04:04:15 UTC (rev 10326)
@@ -106,7 +106,7 @@
 if ($action == 'search') {
     $xoops->header();
     include $xoops->path('include/searchform.php');
-    $search_form->render(false);
+    $search_form->display();
     $xoops->footer();
     exit;
 }
@@ -139,6 +139,7 @@
         $queries_pattern[] = '~(' . $myts->addSlashes($query) . ')~sUi';
     }
 }
+
 switch ($action) {
     case "results":
         $module_handler = $xoops->getHandlerModule();
@@ -206,7 +207,7 @@
         }
         $xoops->tpl->assign('modules', $modules_result);
         include $xoops->path('include/searchform.php');
-        $search_form->render();
+        $search_form->display();
         break;
 
     case "showall":