Hello community,
here is the log from the commit of package phpMyAdmin
checked in at Thu Aug 24 17:41:14 CEST 2006.
--------
--- phpMyAdmin/phpMyAdmin.changes 2006-08-15 17:07:22.000000000 +0200
+++ phpMyAdmin/phpMyAdmin.changes 2006-08-23 15:49:58.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 23 15:48:12 CEST 2006 - anosek@suse.cz
+
+- updated to 2.8.2.4
+ * fixed cookie login on IIS with IE6
+ * fixed switching from scripts/setup.php to the main script
+ in case of register_globals enabled
+
+-------------------------------------------------------------------
Old:
----
phpMyAdmin-2.8.2.2.tar.bz2
New:
----
phpMyAdmin-2.8.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.KRy2wX/_old 2006-08-24 17:40:46.000000000 +0200
+++ /var/tmp/diff_new_pack.KRy2wX/_new 2006-08-24 17:40:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package phpMyAdmin (Version 2.8.2.2)
+# spec file for package phpMyAdmin (Version 2.8.2.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
Group: Productivity/Networking/Web/Frontends
Requires: mod_php_any php-mysql php-bz2 php-gd php-zlib php-iconv php-mcrypt php-session apache2
Autoreqprov: on
-Version: 2.8.2.2
+Version: 2.8.2.4
Release: 1
Source0: %{name}-%{version}.tar.bz2
Patch1: %{name}-blowfish_secret.patch
@@ -125,6 +125,11 @@
%verify(not md5 size mtime) %config(noreplace) %{serverroot}%{name}/libraries/blowfish_secret.inc.php
%changelog -n phpMyAdmin
+* Wed Aug 23 2006 - anosek@suse.cz
+- updated to 2.8.2.4
+ * fixed cookie login on IIS with IE6
+ * fixed switching from scripts/setup.php to the main script
+ in case of register_globals enabled
* Tue Aug 15 2006 - anosek@suse.cz
- update to 2.8.2.2
* fixed config not loaded on install (MySQL error code 2002
++++++ phpMyAdmin-2.8.2.2.tar.bz2 -> phpMyAdmin-2.8.2.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/ChangeLog new/phpMyAdmin-2.8.2.4/ChangeLog
--- old/phpMyAdmin-2.8.2.2/ChangeLog 2006-08-11 18:45:56.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/ChangeLog 2006-08-22 20:01:45.000000000 +0200
@@ -2,9 +2,24 @@
phpMyAdmin - Changelog
----------------------
-$Id: ChangeLog,v 2.1929.2.142.2.7 2006/08/11 16:45:56 lem9 Exp $
+$Id: ChangeLog,v 2.1929.2.142.2.13 2006/08/22 18:01:45 lem9 Exp $
$Source: /cvsroot/phpmyadmin/phpMyAdmin/ChangeLog,v $
+2006-08-22 Marc Delisle
+ * scripts/setup.php: bug #1536112, better fix (in case of
+ register_globals enabled), thanks to Michal
+ ### 2.8.2.3 released from MAINT_2_8_2
+ * scripts/setup.php: bug #1544692, version 2.8.2.3 breaks setup.php
+ on a server with register_globals enabled, thanks to Juergen Windkiel
+ ### 2.8.2.4 released from MAINT_2_8_2
+
+2006-08-21 Marc Delisle
+ * libraries/common.lib.php, libraries/auth/cookie.auth.lib.php:
+ bug #1542875, Cookie auth on IIS
+
+2006-08-14 Marc Delisle
+ ### 2.8.2.2 released from MAINT_2_8_2
+
2006-08-11 Marc Delisle
* libraries/auth/config.auth.lib.php: bug #1536112, config not loaded
(MySQL error 2002 or 2003)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/Documentation.html new/phpMyAdmin-2.8.2.4/Documentation.html
--- old/phpMyAdmin-2.8.2.2/Documentation.html 2006-08-02 18:48:53.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/Documentation.html 2006-08-22 19:00:29.000000000 +0200
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- $Id: Documentation.html,v 2.205.2.21.2.2 2006/08/02 16:48:53 lem9 Exp $ -->
+<!-- $Id: Documentation.html,v 2.205.2.21.2.5 2006/08/22 17:00:29 lem9 Exp $ -->
<!--
vim: expandtab ts=4 sw=4 sts=4 tw=78
-->
@@ -9,7 +9,7 @@
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>phpMyAdmin 2.8.2.1 - Documentation</title>
+ <title>phpMyAdmin 2.8.2.4 - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -33,7 +33,7 @@
<hr noshade="noshade" width="100%" />
</div>
-<h1>phpMyAdmin 2.8.2.1 Documentation</h1>
+<h1>phpMyAdmin 2.8.2.4 Documentation</h1>
<!-- TOP MENU -->
@@ -53,7 +53,7 @@
</li>
<li>
Documentation version:
- <i>$Id: Documentation.html,v 2.205.2.21.2.2 2006/08/02 16:48:53 lem9 Exp $</i>
+ <i>$Id: Documentation.html,v 2.205.2.21.2.5 2006/08/22 17:00:29 lem9 Exp $</i>
</li>
</ul>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/Documentation.txt new/phpMyAdmin-2.8.2.4/Documentation.txt
--- old/phpMyAdmin-2.8.2.2/Documentation.txt 2006-08-14 18:00:14.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/Documentation.txt 2006-08-22 20:03:35.000000000 +0200
@@ -5,15 +5,15 @@
Transformations - FAQ - Developers - Credits - Translators
-------------------------------------------------------------------------------
-phpMyAdmin 2.8.2.1 Documentation
+phpMyAdmin 2.8.2.4 Documentation
* SourceForge phpMyAdmin project page [ http://www.phpmyadmin.net/ ]
* Local documents:
+ Version history: ChangeLog
+ General notes: README
+ License: LICENSE
- * Documentation version: $Id: Documentation.html,v 2.205.2.21.2.2 2006/08/02
- 16:48:53 lem9 Exp $
+ * Documentation version: $Id: Documentation.html,v 2.205.2.21.2.5 2006/08/22
+ 17:00:29 lem9 Exp $
Requirements
@@ -2416,7 +2416,7 @@
) TYPE=MyISAM;
INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');
- INSERT INTO REL_towns VALUES ('M', 'Montr?al');
+ INSERT INTO REL_towns VALUES ('M', 'Montre'al');
To setup appropriate links and display information:
@@ -2493,7 +2493,7 @@
If you put a backslash before the underscore, it means that the database name
will have a real underscore.
-[6.11] What is the curious symbol ? in the statistics pages?
+[6.11] What is the curious symbol o/ in the statistics pages?
It means "average".
@@ -2543,7 +2543,7 @@
installed all the needed modules.
If you use the Validator, you should be aware that any SQL statement you submit
will be stored anonymously (database/table/column names, strings, numbers
-replaced with generic values). The Mimer SQL Validator itself, is ? 2001
+replaced with generic values). The Mimer SQL Validator itself, is (C) 2001
Upright Database Technology. We utilize it as free SOAP service.
[6.15] I want to add a BLOB field and put an index on it, but MySQL says "BLOB
@@ -2872,14 +2872,14 @@
* SQL analyser (most of it)
* current project maintainer
-- Olivier M?ller
+- Olivier Mu:ller
* started SourceForge phpMyAdmin project in March 2001
* sync'ed different existing CVS trees with new features and bugfixes
* multi-language improvements, dynamic language selection
* current project maintainer
* many bugfixes and improvements
-- Lo?c Chapeaux
+- Loi:c Chapeaux
* rewrote and optimized javascript, DHTML and DOM stuff
* rewrote the scripts so they fit the PEAR coding standards and
generate XHTML1.0 and CSS2 compliant codes
@@ -2941,7 +2941,7 @@
* various features and fixes
* Czech language file updates
-- Christophe Gesch? from the "MySQL Form Generator for PHPMyAdmin"
+- Christophe Gesche' from the "MySQL Form Generator for PHPMyAdmin"
(http://sourceforge.net/projects/phpmysqlformgen/)
* suggested the patch for multiple table printviews
@@ -2988,7 +2988,7 @@
* redesign for 2.6.0
* phpMyAdmin sailboat logo (June 2004)
-- Mathias Landh?u?er
+- Mathias Landha:usser
* Representation at conferences
- Sebastian Mendel
@@ -2999,13 +2999,13 @@
enhancements, bugfixes or support for a new language since version 2.1.0:
Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita,
-P?ter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow,
-Mats Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kl?ger,
+Pe'ter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow,
+Mats Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kla:ger,
Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg, Andreas Pauley,
Bernard M. Piller, Laurent Haas, "Sakamoto", Yuval Sarna,
www.securereality.com.au, Alexis Soulard, Alvar Soome, Siu Sun, Peter Svec,
Michael Tacelosky, Rachim Tamsjadi, Kositer Uros,
-Lu?s V., Martijn W. van der Lee,
+Lui's V., Martijn W. van der Lee,
Algis Vainauskas, Daniel Villanueva, Vinay, Ignacio Vazquez-Abrams, Chee Wai,
Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/README new/phpMyAdmin-2.8.2.4/README
--- old/phpMyAdmin-2.8.2.2/README 2006-08-01 15:58:19.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/README 2006-08-22 19:08:08.000000000 +0200
@@ -1,11 +1,11 @@
-$Id: README,v 2.40.2.8.2.1 2006/08/01 13:58:19 lem9 Exp $
+$Id: README,v 2.40.2.8.2.4 2006/08/22 17:08:08 lem9 Exp $
phpMyAdmin - Readme
===================
A set of PHP-scripts to manage MySQL over the web.
- Version 2.8.2.1
+ Version 2.8.2.4
---------------
http://www.phpmyadmin.net/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.2 new/phpMyAdmin-2.8.2.4/RELEASE-DATE-2.8.2.2
--- old/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.2 2006-08-14 18:00:12.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/RELEASE-DATE-2.8.2.2 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Mon Aug 14 16:00:12 UTC 2006
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.4 new/phpMyAdmin-2.8.2.4/RELEASE-DATE-2.8.2.4
--- old/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.4 1970-01-01 01:00:00.000000000 +0100
+++ new/phpMyAdmin-2.8.2.4/RELEASE-DATE-2.8.2.4 2006-08-22 20:03:35.000000000 +0200
@@ -0,0 +1 @@
+Tue Aug 22 18:03:35 UTC 2006
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/libraries/Config.class.php new/phpMyAdmin-2.8.2.4/libraries/Config.class.php
--- old/phpMyAdmin-2.8.2.2/libraries/Config.class.php 2006-08-02 23:08:00.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/libraries/Config.class.php 2006-08-22 19:00:00.000000000 +0200
@@ -1,5 +1,5 @@
<?php
-/* $Id: Config.class.php,v 1.21.2.18.2.3 2006/08/02 21:08:00 lem9 Exp $ */
+/* $Id: Config.class.php,v 1.21.2.18.2.8 2006/08/22 17:00:00 lem9 Exp $ */
// vim: expandtab sw=4 ts=4 sts=4:
class PMA_Config
@@ -76,7 +76,7 @@
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '2.8.2.2-dev');
+ $this->set('PMA_VERSION', '2.8.2.4');
/**
* @deprecated
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/libraries/auth/cookie.auth.lib.php new/phpMyAdmin-2.8.2.4/libraries/auth/cookie.auth.lib.php
--- old/phpMyAdmin-2.8.2.2/libraries/auth/cookie.auth.lib.php 2006-04-11 18:33:33.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/libraries/auth/cookie.auth.lib.php 2006-08-21 13:45:16.000000000 +0200
@@ -1,5 +1,5 @@
<?php
-/* $Id: cookie.auth.lib.php,v 2.55.2.1 2006/04/11 16:33:33 cybot_tm Exp $ */
+/* $Id: cookie.auth.lib.php,v 2.55.2.1.4.1 2006/08/21 11:45:16 lem9 Exp $ */
// vim: expandtab sw=4 ts=4 sts=4:
// +--------------------------------------------------------------------------+
@@ -477,6 +477,7 @@
$url_params['target'] = $GLOBALS['target'];
}
+ define('PMA_COMING_FROM_COOKIE_LOGIN',1);
PMA_sendHeaderLocation( $redirect_url . PMA_generate_common_url( $url_params, '&' ) );
exit();
} // end if
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/libraries/common.lib.php new/phpMyAdmin-2.8.2.4/libraries/common.lib.php
--- old/phpMyAdmin-2.8.2.2/libraries/common.lib.php 2006-08-01 16:18:28.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/libraries/common.lib.php 2006-08-21 13:45:16.000000000 +0200
@@ -1,5 +1,5 @@
<?php
-/* $Id: common.lib.php,v 2.266.2.27.2.1 2006/08/01 14:18:28 lem9 Exp $ */
+/* $Id: common.lib.php,v 2.266.2.27.2.2 2006/08/21 11:45:16 lem9 Exp $ */
// vim: expandtab sw=4 ts=4 sts=4:
/**
@@ -1084,11 +1084,11 @@
session_write_close();
// bug #1523784, IE6 does not like 'Refresh: 0', it
// results in a blank page
- //if (PMA_IS_IIS) {
- // header('Refresh: 0; ' . $uri);
- //} else {
+ if (PMA_IS_IIS && defined('PMA_COMING_FROM_COOKIE_LOGIN')) {
+ header('Refresh: 0; ' . $uri);
+ } else {
header('Location: ' . $uri);
- //}
+ }
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/scripts/setup.php new/phpMyAdmin-2.8.2.4/scripts/setup.php
--- old/phpMyAdmin-2.8.2.2/scripts/setup.php 2006-08-01 16:01:37.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/scripts/setup.php 2006-08-22 19:36:34.000000000 +0200
@@ -1,5 +1,5 @@
<?php
-/* $Id: setup.php,v 1.23.2.10.2.1 2006/08/01 14:01:37 lem9 Exp $ */
+/* $Id: setup.php,v 1.23.2.10.2.4 2006/08/22 17:36:34 lem9 Exp $ */
// vim: expandtab sw=4 ts=4 sts=4:
// phpMyAdmin setup script by Michal Čihař <michal@cihar.com>
@@ -10,11 +10,13 @@
require_once('./libraries/common.lib.php');
// Grab configuration defaults
-$PMA_Config = new PMA_Config();
+// Do not use $PMA_Config, it interferes with the one in $_SESSION
+// on servers with register_globals enabled
+$PMA_Config_Setup = new PMA_Config();
// Script information
-$script_info = 'phpMyAdmin ' . $PMA_Config->get('PMA_VERSION') . ' setup script by Michal Čihař <michal@cihar.com>';
-$script_version = '$Id: setup.php,v 1.23.2.10.2.1 2006/08/01 14:01:37 lem9 Exp $';
+$script_info = 'phpMyAdmin ' . $PMA_Config_Setup->get('PMA_VERSION') . ' setup script by Michal Čihař <michal@cihar.com>';
+$script_version = '$Id: setup.php,v 1.23.2.10.2.4 2006/08/22 17:36:34 lem9 Exp $';
// Grab action
if (isset($_POST['action'])) {
@@ -60,7 +62,7 @@
<head>
<link rel="icon" href="../favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
- <title>phpMyAdmin <?php echo $PMA_Config->get('PMA_VERSION'); ?> setup</title>
+ <title>phpMyAdmin <?php echo $PMA_Config_Setup->get('PMA_VERSION'); ?> setup</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script type="text/javascript" language="javascript">
@@ -214,7 +216,7 @@
</head>
<body>
-<h1>phpMyAdmin <?php echo $PMA_Config->get('PMA_VERSION'); ?> setup</h1>
+<h1>phpMyAdmin <?php echo $PMA_Config_Setup->get('PMA_VERSION'); ?> setup</h1>
<?php
} // end show html header
@@ -369,19 +371,19 @@
* @return string authentication method description
*/
function get_server_auth($val) {
- global $PMA_Config;
+ global $PMA_Config_Setup;
if (isset($val['auth_type'])) {
$auth = $val['auth_type'];
} else {
- $auth = $PMA_Config->default_server['auth_type'];
+ $auth = $PMA_Config_Setup->default_server['auth_type'];
}
$ret = $auth;
if ($auth == 'config') {
if (isset($val['user'])) {
$ret .= ':' . $val['user'];
} else {
- $ret .= ':' . $PMA_Config->default_server['user'];
+ $ret .= ':' . $PMA_Config_Setup->default_server['user'];
}
}
return $ret;
@@ -632,7 +634,7 @@
}
/**
- * Displays configuration, fallback defaults are taken from global $PMA_Config
+ * Displays configuration, fallback defaults are taken from global $PMA_Config_Setup
*
* @param array list of values to display (each element is array of two or
* three values - desription, name and optional type
@@ -648,7 +650,7 @@
* @return nothing
*/
function show_config_form($list, $legend, $help, $defaults = array(), $save = '', $prefix = '') {
- global $PMA_Config;
+ global $PMA_Config_Setup;
if (empty($save)) {
$save = 'Update';
@@ -677,7 +679,7 @@
if (isset($defaults[$val[1]])) {
echo ' value="' . htmlspecialchars($defaults[$val[1]]) . '"';
} else {
- echo ' value="' . htmlspecialchars($PMA_Config->get($val[1])) . '"';
+ echo ' value="' . htmlspecialchars($PMA_Config_Setup->get($val[1])) . '"';
}
echo ' />';
break;
@@ -688,7 +690,7 @@
echo ' checked="checked"';
}
} else {
- if ($PMA_Config->get($val[1])) {
+ if ($PMA_Config_Setup->get($val[1])) {
echo ' checked="checked"';
}
}
@@ -711,7 +713,7 @@
}
}
} else {
- $def_val = $PMA_Config->get($val[1]);
+ $def_val = $PMA_Config_Setup->get($val[1]);
if (is_bool($val)) {
if (($def_val && $opt == 'TRUE') || (!$def_val && $opt == 'FALSE')) {
echo ' selected="selected"';
@@ -804,7 +806,7 @@
* @return nothing
*/
function show_charset_form($defaults = array()) {
- global $PMA_Config;
+ global $PMA_Config_Setup;
?>
<form method="post" action="">
<input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
@@ -813,7 +815,7 @@
echo get_hidden_cfg();
show_config_form(array(
array('Allow charset conversion', 'AllowAnywhereRecoding', 'If you want to use such functions.', FALSE),
- array('Default charset', 'DefaultCharset', 'Default charset for conversion.', $PMA_Config->get('AvailableCharsets')),
+ array('Default charset', 'DefaultCharset', 'Default charset for conversion.', $PMA_Config_Setup->get('AvailableCharsets')),
array('Recoding engine', 'RecodingEngine', 'PHP can contain iconv and/or recode, select which one to use or keep autodetection.', array('auto', 'iconv', 'recode')),
array('Extra params for iconv', 'IconvExtraParams', 'Iconv can get some extra parameters for conversion see man iconv_open.'),
),
@@ -858,7 +860,7 @@
* @return nothing
*/
function show_relation_form($defaults = array()) {
- global $PMA_Config;
+ global $PMA_Config_Setup;
?>
<form method="post" action="">
<input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
@@ -869,7 +871,7 @@
array('Permanent query history', 'QueryHistoryDB', 'Store history into database.', FALSE),
array('Maximal history size', 'QueryHistoryMax', 'How many queries are kept in history.'),
array('Use MIME transformations', 'BrowseMIME', 'Use MIME transformations while browsing.', TRUE),
- array('PDF default page size', 'PDFDefaultPageSize', 'Default page size for PDF, you can change this while creating page.', $PMA_Config->get('PDFPageSizes')),
+ array('PDF default page size', 'PDFDefaultPageSize', 'Default page size for PDF, you can change this while creating page.', $PMA_Config_Setup->get('PDFPageSizes')),
),
'Configure MIME/relation/history',
'phpMyAdmin can provide additional featrues like MIME transformation, internal relations, permanent history and PDF pages generating. You have to configure database and tables that will store such information on server page. Behaviour of those functions is configured here.',
@@ -1339,7 +1341,7 @@
case 'addserver':
if (count($configuration['Servers']) == 0) {
// First server will use defaults as in config.default.php
- $defaults = $PMA_Config->default_server;
+ $defaults = $PMA_Config_Setup->default_server;
unset($defaults['AllowDeny']); // Ignore this for now
} else {
$defaults = array();
@@ -1391,7 +1393,7 @@
$data[] = array('Verbose name', $srv['verbose']);
}
$data[] = array('Host', $srv['host']);
- $data[] = array('MySQL extension', isset($srv['extension']) ? $srv['extension'] : $PMA_Config->default_server['extension']);
+ $data[] = array('MySQL extension', isset($srv['extension']) ? $srv['extension'] : $PMA_Config_Setup->default_server['extension']);
$data[] = array('Authentication type', get_server_auth($srv));
$data[] = array('phpMyAdmin advanced features', empty($srv['pmadb']) || empty($srv['controluser']) || empty($srv['controlpass']) ? 'disabled' : 'enabled, db: ' . $srv['pmadb'] . ', user: ' . $srv['controluser']);
$buttons =
@@ -1806,7 +1808,7 @@
break;
}
- $version_local = version_to_int( $GLOBALS['PMA_Config']->get('PMA_VERSION') );
+ $version_local = version_to_int( $PMA_Config_Setup->get('PMA_VERSION') );
if ($version_local === FALSE) {
message('error', 'Unparsable version string.');
break;
@@ -1831,7 +1833,7 @@
case '':
message('notice', 'You want to configure phpMyAdmin using web interface. Please note that this only allows basic setup, please read <a href="../Documentation.html#config">documentation</a> to see full description of all configuration directives.', 'Welcome');
- if ( $GLOBALS['PMA_Config']->get( 'PMA_PHP_INT_VERSION' ) < 40100) {
+ if ( $PMA_Config_Setup->get( 'PMA_PHP_INT_VERSION' ) < 40100) {
message('warning', 'Please upgrade to PHP 4.1.0, it is required for phpMyAdmin.', 'Too old PHP');
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.2/translators.html new/phpMyAdmin-2.8.2.4/translators.html
--- old/phpMyAdmin-2.8.2.2/translators.html 2006-08-02 18:59:28.000000000 +0200
+++ new/phpMyAdmin-2.8.2.4/translators.html 2006-08-22 19:08:28.000000000 +0200
@@ -1,13 +1,13 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- $Id: translators.html,v 2.64.2.8.2.2 2006/08/02 16:59:28 lem9 Exp $ -->
+<!-- $Id: translators.html,v 2.64.2.8.2.5 2006/08/22 17:08:28 lem9 Exp $ -->
<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>phpMyAdmin 2.8.2.1 - Official translators</title>
+ <title>phpMyAdmin 2.8.2.4 - Official translators</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -29,7 +29,7 @@
<hr noshade="noshade" width="100%" />
</div>
-<h1>phpMyAdmin 2.8.2.1 official translators list</h1>
+<h1>phpMyAdmin 2.8.2.4 official translators list</h1>
<p>
Here is the list of the "official translators" of
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org