[Tikiwiki-cvs] SF.net SVN: tikiwiki: [12178] branches/1.10

[<Jy...@us...>]

Revision: 12178
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12178&view=rev
Author:   Jyhem
Date:     2008-03-25 09:01:40 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
[FIX] This should allow admin section to appear immediately for admin after a fresh install

Modified Paths:
--------------
    branches/1.10/templates/tiki-change_password.tpl
    branches/1.10/tiki-change_password.php

Modified: branches/1.10/templates/tiki-change_password.tpl
===================================================================
--- branches/1.10/templates/tiki-change_password.tpl	2008-03-25 14:52:21 UTC (rev 12177)
+++ branches/1.10/templates/tiki-change_password.tpl	2008-03-25 16:01:40 UTC (rev 12178)
@@ -3,7 +3,7 @@
 <table class="normal">
 <tr>
   <td class="formcolor">{tr}User{/tr}:</td>
-  <td class="formcolor"><input type="text" name="user" value="{$user|escape}" /></td>
+  <td class="formcolor"><input type="text" name="user" value="{$userlogin|escape}" /></td>
 </tr>  
 <tr>
   <td class="formcolor">{if $tiki_p_admin eq 'y'}{tr}Admin password{/tr}{else}{tr}Old password{/tr}{/if}:</td>

Modified: branches/1.10/tiki-change_password.php
===================================================================
--- branches/1.10/tiki-change_password.php	2008-03-25 14:52:21 UTC (rev 12177)
+++ branches/1.10/tiki-change_password.php	2008-03-25 16:01:40 UTC (rev 12178)
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/tikiwiki/tiki/tiki-change_password.php,v 1.20.2.2 2008-03-20 17:03:31 jyhem Exp $
+// $Header: /cvsroot/tikiwiki/tiki/tiki-change_password.php,v 1.20.2.2 2008/03/20 17:03:31 jyhem Exp $
 
 // Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -21,7 +21,7 @@
 if (!isset($_REQUEST["oldpass"]))
 	$_REQUEST["oldpass"] = '';
 
-$smarty->assign('user', $_REQUEST["user"]);
+$smarty->assign('userlogin', $_REQUEST["user"]);
 $smarty->assign('oldpass', $_REQUEST["oldpass"]);
 
 if (isset($_REQUEST["change"])) {
@@ -62,8 +62,6 @@
 	$userlib->change_user_password($_REQUEST["user"], $_REQUEST["pass"]);
 	// Login the user
 	$_SESSION["$user_cookie_site"] = $_REQUEST["user"];
-	$user = $_REQUEST["user"];
-	$smarty->assign_by_ref('user', $user);
 	header ('location: '.$prefs['tikiIndex']);
 }
 ask_ticket('change-password');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.