Changeset 1091

Show
Ignore:
Timestamp:
03/31/08 14:23:40 (8 months ago)
Author:
rats
Message:

Update PHPmyAdmin to version 2.11.5.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG

    r1090 r1091  
    1111        - LANGUAGES: 
    1212                * Added: Bulgarian 
     13        - TOOLS: 
     14                * Update PHPmyAdmin to version 2.11.5.1 
    1315 
    14162008-03-29 Jochen Manz 
  • trunk/gui/tools/pma/ChangeLog

    r1026 r1091  
    33---------------------- 
    44 
    5 $Id: ChangeLog 11151 2008-03-01 11:59:07Z lem9 $ 
     5$Id: ChangeLog 11175 2008-03-29 06:06:35Z lem9 $ 
    66$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 
     7 
     82.11.5.1 (2008-03-29) 
     9- bug #1909711 [security] Sensitive data in session files 
    710 
    8112.11.5.0 (2008-03-01) 
  • trunk/gui/tools/pma/Documentation.html

    r1026 r1091  
    33<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" 
    44    version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> 
    5 <!-- $Id: Documentation.html 11151 2008-03-01 11:59:07Z lem9 $ --> 
     5<!-- $Id: Documentation.html 11177 2008-03-29 13:26:51Z lem9 $ --> 
    66<!-- 
    77    vim: expandtab ts=4 sw=4 sts=4 tw=78 
     
    1212    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> 
    1313    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
    14     <title>phpMyAdmin 2.11.5 - Documentation</title> 
     14    <title>phpMyAdmin 2.11.5.1 - Documentation</title> 
    1515    <link rel="stylesheet" type="text/css" href="docs.css" /> 
    1616</head> 
     
    3434</ul> 
    3535 
    36 <h1>phpMyAdmin 2.11.5 Documentation</h1> 
     36<h1>phpMyAdmin 2.11.5.1 Documentation</h1> 
    3737 
    3838<ul><li><a href="http://www.phpmyadmin.net/"> 
     
    4949    </li> 
    5050    <li>Documentation version: 
    51         <i>$Id: Documentation.html 11151 2008-03-01 11:59:07Z lem9 $</i> 
     51        <i>$Id: Documentation.html 11177 2008-03-29 13:26:51Z lem9 $</i> 
    5252    </li> 
    5353</ul> 
  • trunk/gui/tools/pma/Documentation.txt

    r1026 r1091  
    1212  * Glossary 
    1313 
    14 phpMyAdmin 2.11.5 Documentation 
     14phpMyAdmin 2.11.5.1 Documentation 
    1515 
    1616  * phpMyAdmin homepage 
     
    2121      + General notes: README 
    2222      + License: LICENSE 
    23   * Documentation version: $Id: Documentation.html 11151 2008-03-01 11:59:07
     23  * Documentation version: $Id: Documentation.html 11177 2008-03-29 13:26:51
    2424    lem9 $ 
    2525 
  • trunk/gui/tools/pma/README

    r1026 r1091  
    1 $Id: README 11151 2008-03-01 11:59:07Z lem9 $ 
     1$Id: README 11177 2008-03-29 13:26:51Z lem9 $ 
    22 
    33phpMyAdmin - Readme 
     
    66  A set of PHP-scripts to manage MySQL over the web. 
    77 
    8   Version 2.11.5 
    9   -------------- 
     8  Version 2.11.5.1 
     9  ---------------- 
    1010  http://www.phpmyadmin.net/ 
    1111 
  • trunk/gui/tools/pma/libraries/Config.class.php

    r1026 r1091  
    44 * 
    55 * 
    6  * @version $Id: Config.class.php 11151 2008-03-01 11:59:07Z lem9 $ 
     6 * @version $Id: Config.class.php 11177 2008-03-29 13:26:51Z lem9 $ 
    77 */ 
    88 
     
    8686    function checkSystem() 
    8787    { 
    88         $this->set('PMA_VERSION', '2.11.5'); 
     88        $this->set('PMA_VERSION', '2.11.5.1'); 
    8989        /** 
    9090         * @deprecated 
     
    887887    function enableBc() 
    888888    { 
    889         $GLOBALS['cfg']             =& $this->settings; 
    890         $GLOBALS['default_server']  =& $this->default_server; 
     889        $GLOBALS['cfg']             = $this->settings; 
     890        $GLOBALS['default_server']  = $this->default_server; 
     891        unset($this->default_server); 
    891892        $GLOBALS['collation_connection'] = $this->get('collation_connection'); 
    892893        $GLOBALS['is_upload']       = $this->get('enable_upload'); 
  • trunk/gui/tools/pma/libraries/common.inc.php

    r1026 r1091  
    2323 * - authentication work 
    2424 * 
    25  * @version $Id: common.inc.php 11135 2008-02-23 21:16:42Z lem9 $ 
     25 * @version $Id: common.inc.php 11175 2008-03-29 06:06:35Z lem9 $ 
    2626 */ 
    2727 
     
    464464/* parsing configuration file                         LABEL_parsing_config_file      */ 
    465465 
    466 if (empty($_SESSION['PMA_Config'])) { 
    467     /** 
    468      * We really need this one! 
    469      */ 
    470     if (! function_exists('preg_replace')) { 
    471         PMA_fatalError('strCantLoad', 'pcre'); 
    472     } 
    473  
    474     /** 
    475      * @global PMA_Config $_SESSION['PMA_Config'] 
    476      */ 
    477     $_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php'); 
    478  
    479 } elseif (version_compare(phpversion(), '5', 'lt')) { 
    480     /** 
    481      * @todo move all __wakeup() functionality into session.inc.php 
    482      */ 
    483     $_SESSION['PMA_Config']->__wakeup(); 
    484 
     466/** 
     467 * We really need this one! 
     468 */ 
     469if (! function_exists('preg_replace')) { 
     470    PMA_fatalError('strCantLoad', 'pcre'); 
     471
     472 
     473/** 
     474 * @global PMA_Config $_SESSION['PMA_Config'] 
     475 * force reading of config file, because we removed sensitive values 
     476 * in the previous iteration 
     477 */ 
     478$_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php'); 
    485479 
    486480if (!defined('PMA_MINIMUM_COMMON')) { 
     
    902896} // end if !defined('PMA_MINIMUM_COMMON') 
    903897 
     898// remove sensitive values from session 
     899$_SESSION['PMA_Config']->set('blowfish_secret', ''); 
     900$_SESSION['PMA_Config']->set('Servers', ''); 
     901$_SESSION['PMA_Config']->set('default_server', ''); 
     902 
    904903if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { 
    905904    /** 
  • trunk/gui/tools/pma/translators.html

    r1026 r1091  
    33<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" 
    44    version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> 
    5 <!-- $Id: translators.html 11151 2008-03-01 11:59:07Z lem9 $ --> 
     5<!-- $Id: translators.html 11177 2008-03-29 13:26:51Z lem9 $ --> 
    66 
    77<head> 
     
    99    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> 
    1010    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
    11     <title>phpMyAdmin 2.11.5 - Official translators</title> 
     11    <title>phpMyAdmin 2.11.5.1 - Official translators</title> 
    1212    <link rel="stylesheet" type="text/css" href="docs.css" /> 
    1313</head> 
     
    3232</ul> 
    3333 
    34 <h1>phpMyAdmin 2.11.5 official translators list</h1> 
     34<h1>phpMyAdmin 2.11.5.1 official translators list</h1> 
    3535 
    3636<p> Here is the list of the &quot;official translators&quot; of