Backwards compatibility, remerged changes after RC3

2002-07-17 06:52:09 +00:00
parent 91bdb92806
commit aa8e7b70fa
5 changed files with 60 additions and 45 deletions
--- a/9
+++ b/9
@@ -4,12 +4,19 @@ phpMyAdmin - Changelog

 $Id$
 $Source$
+
+2002-07-17 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libraries/common.lib.php3, libraries/config_import.lib.php3: Added
+      $cfg['PmaNoRelation_DisableWarning'] to the backwards compatibility code.
+    * config.inc.php3, Documentation.html: Remerged the changes that were
+      removed in the previous revision, thanks to Bj<42>rn T. Hallberg (bth).
+
 2002-07-16 Mike Beck <mikebeck@users.sourceforge.net>
    * pdf_pages.php3: if a page is edit it can also be shown
    * pdf_schema.php3: now it is possible to have all tables
      displayed with the same (maximum) width
      (feature request 576537)
-      
+
 2002-07-16 Mike Beck <mikebeck@users.sourceforge.net>
    * libraries/relation.lib.php3: verbose mode
    * db_details_structure.php3: show message if relation doesn't work
--- a/Documentation.html
+++ b/Documentation.html
@@ -5,7 +5,7 @@

 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.3.0-rc3 - Documentation</title>
+    <title>phpMyAdmin 2.3.0-rc4 - Documentation</title>
    <style type="text/css">
    <!--
    .navigation {
@@ -74,7 +74,7 @@

 <body bgcolor="#FFFFFF">
 <a name="top"></a>
-<h1>phpMyAdmin 2.3.0-rc3 Documentation</h1>
+<h1>phpMyAdmin 2.3.0-rc4 Documentation</h1>


 <!-- TOP MENU -->
@@ -417,19 +417,6 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
        <br /><br />
    </dd>

-    <dt><b>$cfg['PmaNoRelation_DisableWarning']</b> bool</dt>
-    <dd>
-        Starting with version 2.3.0 phpMyAdmin offers a lot of features
-        to work with master / foreign - tables. These features require the
-        PMA Administrator to set up a special Database for PMA.
-        (see <a href="#pmadb">$cfg['Servers'][$i]['pmadb']</a>) Its Contents
-        and use will be explained further down. If you tried to set this up and
-        it does not work for you have a look on the Structure page of one Database
-        where you would like to use it. You will find a link that will analyze
-        why those features have been disabled.<br />
-        If you do not want to use those features set this variable to TRUE
-        to stop this Message from appearing.<br /><br />
-    </dd>
    <dt><b>$cfg['Servers']</b> array</dt>
    <dd>
        Since version 1.4.2, phpMyAdmin supports the administration of multiple
@@ -567,8 +554,9 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
        <br /><br />
    </dd>

-    <a name="pmadb"></a>
-    <dt><b>$cfg['Servers'][$i]['pmadb']</b> string</dt>
+    <dt>
+        <a name="pmadb"></a>
+        <b>$cfg['Servers'][$i]['pmadb']</b> string</dt>
    <dd>
        Starting with version 2.3.0 phpMyAdmin offers a lot of features
        to work with master / foreign - tables. To use those as well as
@@ -791,9 +779,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
        <br /><br />
    </dd>

-    <dt>
-        <a name="col_com"></a>
-        <b>$cfg['Servers'][$i]['column_comments']</b> string</dt>
+    <dt><b>$cfg['Servers'][$i]['column_comments']</b> string</dt>
    <dd>
        Since release 2.3.0 you can store comments to describe each column
        for each table. These will then be shown on the &quot;printview&quot;.
@@ -1351,6 +1337,20 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
        Usually you won't need to change those.
        <br /><br />
    </dd>
+
+<dt><b>$cfg['PmaNoRelation_DisableWarning']</b> bool</dt>
+    <dd>
+        Starting with version 2.3.0 phpMyAdmin offers a lot of features
+        to work with master / foreign - tables. These features require the
+        PMA Administrator to set up a special Database for PMA.
+        (see <a href="#pmadb">$cfg['Servers'][$i]['pmadb']</a>) Its Contents
+        and use will be explained further down. If you tried to set this up and
+        it does not work for you have a look on the Structure page of one Database
+        where you would like to use it. You will find a link that will analyze
+        why those features have been disabled.<br />
+        If you do not want to use those features set this variable to TRUE
+        to stop this Message from appearing.<br /><br />
+    </dd>
 </dl>


@@ -1376,10 +1376,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
 <a class="navigation" href="#faqmultiuser">Multi-user</a> &nbsp;-&nbsp;
 <a class="navigation" href="#faqbrowsers">Browsers</a> &nbsp;-&nbsp;
 <a class="navigation" href="#faqusing">Usage tips</a> &nbsp;-&nbsp;
-<a class="navigation" href="#faqproject">Project</a> &nbsp;-&nbsp;
-<a class="navigation" href="#faqsyntaxcoloring">Syntax coloring</a>
-
-
+<a class="navigation" href="#faqproject">Project</a>

 <a name="faqserver"></a>
 <h3>[Server]</h3>
@@ -1588,17 +1585,15 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
 </p>

 <p>
-    <b>I'm running MySQL&nbsp;4.0.1 on a Windows&nbsp;NT machine. Each time I
-       create a table the table name is changed to lowercase.</b>
+    <b>I'm running MySQL&nbsp;&lt;=&nbsp;4.0.1 having
+       <tt>lower_case_table_names</tt> set to 1. If I create a new table with a
+       capital letter in its name it is changed to lowercase as it should. But
+       if I try to DROP this table MySQL is unable to find the corresponding
+       file.</b>
    <br />
-    This seems to be a bug of MySQL&nbsp;4.0.1 because it also appears when
-    using the MySQL commandline. Currently we only know about its appearance on
-    Windows&nbsp;NT systems, but it is possible that it appears on other
-    systems, too.<br />
-    If you encounter this bug together with another OS and/or MySQL version or
-    you know how to work around it, please post a message into
-    <a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=540671&amp;group_id=23067&amp;atid=377408" target="_blank">
-    our bug tracker</a> at SourceForge.
+    This is a bug of MySQL&nbsp;&lt;=&nbsp;4.0.1. Please upgrade to at least
+    MySQL&nbsp;4.0.2 or turn off your <tt>lower_case_table_names</tt>
+    directive.
 </p>

 <p>
@@ -2139,6 +2134,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
    <br />
    No, it's MySQL that is doing <a class="navigation" href="http://www.mysql.com/doc/S/i/Silent_column_changes.html">silent column type changing</a>.
 </p>
+
 <a name="underscore"></a>
 <p>
    <b>My database has an underscore in it's name, and when I grant privileges
@@ -2156,6 +2152,18 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
    <b>What is the curious symbol &oslash; in the table statistics?</b><br />
    It means &quot;average&quot;.
 </p>
+
+<a name="faqexport"></a>
+<p>
+    <b>I want to understand some Export options.</b><br />
+    &quot;Complete inserts&quot; adds the column names on every INSERT command,
+    for better documentation (but resulting file is bigger).<br />
+    &quot;Extended inserts&quot; provides a shorter dump file by using only
+    once the INSERT verb and the table name.<br />
+    &quot;Enclose table and field names with backquotes&quot; ensures that
+    field and table names formed with special characters are protected.<br />
+</p>
+
 <a name="faqproject"></a>
 <h3>[phpMyAdmin project]</h3>
 <p>
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -12,7 +12,9 @@
 /**
 * Sets the php error reporting - Please do not change this line!
 */
-$old_error_rep = error_reporting(E_ALL);
+if (!isset($old_error_reporting)) {
+    error_reporting(E_ALL);
+}


 /**
@@ -239,7 +241,9 @@ $cfg['DefaultCharset'] = 'iso-8859-1';

 // Allow charset recoding of MySQL queries, must be also enabled in language
 // file to make harder using other language files than unicode.
-$cfg['AllowAnywhereRecoding'] = TRUE;
+// Default value is FALSE to avoid problems on servers without the iconv
+// extension and where dl() is not supported
+$cfg['AllowAnywhereRecoding'] = FALSE;

 // Force: always use this language - must be defined in
 //        libraries/select_lang.lib.php3
@@ -463,13 +467,6 @@ if ($cfg['UseSyntaxColoring']) {
 set_magic_quotes_runtime(0);


-/**
- * Restore old error_reporting mode - do not change either!
- */
-error_reporting($old_error_rep);
-unset($old_error_rep);
-
-
 /**
 * File Revision - do not change either!
 */
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -149,7 +149,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}


    // For compatibility with old config.inc.php3
-    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 116) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 120) {
        include('./libraries/config_import.lib.php3');
    }

--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -715,6 +715,9 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
    if (!isset($cfg['PmaAbsoluteUri_DisableWarning'])) {
        $cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
    }
+    if (!isset($cfg['PmaNoRelation_DisableWarning'])) {
+        $cfg['PmaNoRelation_DisableWarning'] = FALSE;
+    }
 } // $__PMA_CONFIG_IMPORT_LIB__

 ?>