Import Magento Release 1.2.1.2

winman · Mar 4, 2009 · 4cf6b33 · 4cf6b33
1 parent 5f91b42
commit 4cf6b33
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 48 deletions.
diff --git a/app/Mage.php b/app/Mage.php
@@ -82,7 +82,7 @@ final class Mage {
 
     public static function getVersion()
     {
-        return '1.2.1.1';
+        return '1.2.1.2';
     }
 
     /**

diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/default/default/template/forgotpassword.phtml
@@ -55,7 +55,7 @@
                         <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
                     </div>
                     <div class="input-box forgot-password"><label for="email"><?php echo Mage::helper('adminhtml')->__('Email Address:') ?></label><br />
-                        <input type="text" id="email" name="email" value="<?php echo $email ?>" class="required-entry input-text forgot-password" style="width:461px;" />
+                        <input type="text" id="email" name="email" value="" class="required-entry input-text forgot-password" style="width:461px;" />
                     </div>
                     <div class="clear"></div>
                     <div class="form-buttons">

diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml
@@ -51,7 +51,7 @@
                         <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
                     </div>
                     <div class="input-box input-left"><label for="username"><?php echo Mage::helper('adminhtml')->__('User Name:') ?></label><br/>
-                        <input type="text" id="username" name="login[username]" value="<?php echo $username ?>" class="required-entry input-text" /></div>
+                        <input type="text" id="username" name="login[username]" value="" class="required-entry input-text" /></div>
                     <div class="input-box input-right"><label for="login"><?php echo Mage::helper('adminhtml')->__('Password:') ?></label><br />
                         <input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
                     <div class="clear"></div>

diff --git a/downloader/Maged/Model/Session.php b/downloader/Maged/Model/Session.php
@@ -29,7 +29,7 @@ class Maged_Model_Session extends Maged_Model
     protected $_session;
 
     public function start()
-    {
+    {
         if (class_exists('Mage') && Mage::isInstalled()) {
             // initialize Magento Config
             Mage::app();
@@ -128,6 +128,9 @@ public function getMessages($clear = true)
 
     public function getReturnUrl()
     {
-        return $this->get('return_url');
+        if (!$this->_session) {
+            return '';
+        }
+        return Mage::getSingleton('adminhtml/url')->getUrl('adminhtml');
     }
 }
diff --git a/downloader/template/install/footer.phtml b/downloader/template/install/footer.phtml
@@ -36,7 +36,7 @@
     <div class="footer-container">
         <div class="footer">
         <p class="legality">
-            Help Us to Keep Magento Healthy - <a href="http://www.magentocommerce.com/bug-tracking" id="bug_tracking_link"><strong>Report All Bugs</strong></a> (Downloader ver. 1.2.0)<br/>
+            Help Us to Keep Magento Healthy - <a href="http://www.magentocommerce.com/bug-tracking" id="bug_tracking_link"><strong>Report All Bugs</strong></a> (Downloader ver. 1.2.1)<br/>
 
 <script type="text/javascript">
     $('bug_tracking_link').target = "varien_external";

diff --git a/downloader/template/login.phtml b/downloader/template/login.phtml
@@ -1,43 +1,43 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category   Varien
- * @package    Varien_Object
- * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php echo $this->template('header.phtml') ?>
-<?php if ($returnUrl = $this->controller()->session()->getReturnUrl()): ?>
-<a class="f-right" href="<?php echo $returnUrl ?>">Return to Magento Administration</a>
-<?php endif ?>
-<div style="width:300px; padding:20px; margin:90px auto !important; background:#f6f6f6;">
-<form method="post" action="#">
-    <h2 class="page-head">Log In</h2>
-    <p><small>Please re-enter your Magento Adminstration Credentials.<br/>Only administrators with full permissions will be able to log in.</small></p>
-    <table class="form-list">
-        <tr><td class="label"><label for="username">Username:</label></td><td class="value"><input id="username" name="username" value="<?php echo htmlentities($this->get('username'))?>"/></td></tr>
-        <tr><td class="label"><label for="password">Password:</label></td><td class="value"><input type="password" id="password" name="password"/></td></tr>
-        <tr><td></td>
-            <td class="value"><button type="submit">Log In</button></td></tr>
-        </table>
-</form>
-</div>
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Varien
+ * @package    Varien_Object
+ * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php echo $this->template('header.phtml') ?>
+<?php if ($returnUrl = $this->controller()->session()->getReturnUrl()): ?>
+<a class="f-right" href="<?php echo htmlentities($returnUrl) ?>">Return to Magento Administration</a>
+<?php endif ?>
+<div style="width:300px; padding:20px; margin:90px auto !important; background:#f6f6f6;">
+<form method="post" action="#">
+    <h2 class="page-head">Log In</h2>
+    <p><small>Please re-enter your Magento Adminstration Credentials.<br/>Only administrators with full permissions will be able to log in.</small></p>
+    <table class="form-list">
+        <tr><td class="label"><label for="username">Username:</label></td><td class="value"><input id="username" name="username" value=""/></td></tr>
+        <tr><td class="label"><label for="password">Password:</label></td><td class="value"><input type="password" id="password" name="password"/></td></tr>
+        <tr><td></td>
+            <td class="value"><button type="submit">Log In</button></td></tr>
+        </table>
+</form>
+</div>
 <?php echo $this->template('footer.phtml') ?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,7 @@ final class Mage { @@
         public static function getVersion()
         {
-            return '1.2.1.1';
+            return '1.2.1.2';
         }
         /**
@@ Expand Down @@