Point to new setup script in all places, drop old one.
This commit is contained in:
@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
|||||||
+ BLOBstreaming support, thanks to Raj Kissu Rajandran (work in progress)
|
+ BLOBstreaming support, thanks to Raj Kissu Rajandran (work in progress)
|
||||||
+ patch #2067462 [lang] link FAQ references in messages,
|
+ patch #2067462 [lang] link FAQ references in messages,
|
||||||
thanks to Thijs Kinkhorst - kink
|
thanks to Thijs Kinkhorst - kink
|
||||||
|
+ new setup script, thanks to Piotr Przybylski (work in progress)
|
||||||
|
|
||||||
3.0.0.0 (not yet released)
|
3.0.0.0 (not yet released)
|
||||||
+ [export] properly handle line breaks for YAML, thanks to Dan Barry -
|
+ [export] properly handle line breaks for YAML, thanks to Dan Barry -
|
||||||
|
@@ -231,7 +231,7 @@ $cfg['Servers'][$i]['password'] = 'cbb74bc'; // use here your password
|
|||||||
<a href="#config">Configuration Section</a> of this document.</li>
|
<a href="#config">Configuration Section</a> of this document.</li>
|
||||||
<li id="setup_script">Instead of manually editing
|
<li id="setup_script">Instead of manually editing
|
||||||
<tt>config.inc.php</tt>, you can use the
|
<tt>config.inc.php</tt>, you can use the
|
||||||
<a href="scripts/setup.php">Setup Script</a>. First you must
|
<a href="setup/">Setup Script</a>. First you must
|
||||||
manually create a folder <tt>config</tt> in the phpMyAdmin
|
manually create a folder <tt>config</tt> in the phpMyAdmin
|
||||||
directory. This is a security measure. On a Linux/Unix system you
|
directory. This is a security measure. On a Linux/Unix system you
|
||||||
can use the following commands:
|
can use the following commands:
|
||||||
@@ -249,7 +249,7 @@ chmod o+w config/config.inc.php # give it world writable permissions
|
|||||||
web server has read and write access to it. <a href="#faq1_26">FAQ
|
web server has read and write access to it. <a href="#faq1_26">FAQ
|
||||||
1.26</a> can help with this.<br /><br />
|
1.26</a> can help with this.<br /><br />
|
||||||
|
|
||||||
Next, open <tt><a href="scripts/setup.php">scripts/setup.php</a>
|
Next, open <tt><a href="setup/">setup/</a>
|
||||||
</tt>in your browser. Note that <strong>changes are not saved to
|
</tt>in your browser. Note that <strong>changes are not saved to
|
||||||
disk until explicitly choose <tt>Save</tt></strong> from the
|
disk until explicitly choose <tt>Save</tt></strong> from the
|
||||||
<i>Configuration</i> area of the screen. Normally the script saves
|
<i>Configuration</i> area of the screen. Normally the script saves
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||||
/**
|
/**
|
||||||
* phpMyAdmin sample configuration, you can use it as base for
|
* phpMyAdmin sample configuration, you can use it as base for
|
||||||
* manual configuration. For easier setup you can use scripts/setup.php
|
* manual configuration. For easier setup you can use setup/
|
||||||
*
|
*
|
||||||
* All directives are explained in Documentation.html and on phpMyAdmin
|
* All directives are explained in Documentation.html and on phpMyAdmin
|
||||||
* wiki <http://wiki.cihar.com>.
|
* wiki <http://wiki.cihar.com>.
|
||||||
|
@@ -103,7 +103,7 @@ function PMA_auth_fails()
|
|||||||
} else {
|
} else {
|
||||||
// Check whether user has configured something
|
// Check whether user has configured something
|
||||||
if ($_SESSION['PMA_Config']->source_mtime == 0) {
|
if ($_SESSION['PMA_Config']->source_mtime == 0) {
|
||||||
echo '<p>' . sprintf($GLOBALS['strAccessDeniedCreateConfig'], '<a href="scripts/setup.php">', '</a>') . '</p>' . "\n";
|
echo '<p>' . sprintf($GLOBALS['strAccessDeniedCreateConfig'], '<a href="setup/">', '</a>') . '</p>' . "\n";
|
||||||
} elseif (!isset($GLOBALS['errno']) || (isset($GLOBALS['errno']) && $GLOBALS['errno'] != 2002) && $GLOBALS['errno'] != 2003) {
|
} elseif (!isset($GLOBALS['errno']) || (isset($GLOBALS['errno']) && $GLOBALS['errno'] != 2002) && $GLOBALS['errno'] != 2003) {
|
||||||
// if we display the "Server not responding" error, do not confuse users
|
// if we display the "Server not responding" error, do not confuse users
|
||||||
// by telling them they have a settings problem
|
// by telling them they have a settings problem
|
||||||
|
2027
scripts/setup.php
2027
scripts/setup.php
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user