Merge branch 'master' into gettext

2010-03-19 00:28:20 +01:00
parent eca4526948 7e77192187
commit a1beb0fb3f
8 changed files with 52 additions and 46 deletions
--- a/5
+++ b/5
@@ -49,6 +49,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Turkish update, thanks to Burak Yavuz
 + rfe #2963310 [interface] Focus TEXTAREA "sql_query" on click on "SQL" link
 + [lang] Uzbek update, thanks to Orzu Samarqandiy
+ rfe #2958013 [import] After import, also list uploaded filename, thanks
+  to Pavel Konnikov and Herman van Rink

 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
@@ -57,6 +59,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2967366 [Structure] Some results of Propose table structure are
  shown in hex
 - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
+- [navi] Changed link to git repository on main page
+- bug #2972232 [menu] Import menu tab not present on main page

 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 
@@ -69,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
  thanks to Dieter Adriaenssens - ruleant
 - bug #2961198 [parser] Querying a table named "data"
 - bug #2931429 [structure] Editing long triggers
+- bug #2970769 [structure] Incorrect reference to mootools-more.js 

 3.3.0.0 (2010-03-07)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
--- a/Documentation.html
+++ b/Documentation.html
@@ -1115,7 +1115,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
        <span id="cfg_Servers_tracking_drop_view">$cfg['Servers'][$i]['tracking_version_drop_view']</span> boolean
    </dt>
    <dd>
-        Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true.
+        Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true.
        <br/><br/>       
    </dd>

@@ -1124,7 +1124,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
        <span id="cfg_Servers_tracking_drop_table">$cfg['Servers'][$i]['tracking_version_drop_table']</span> boolean
    </dt>
    <dd>
-        Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true.
+        Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true.
        <br/><br/>
    </dd>

@@ -1132,7 +1132,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
        <span id="cfg_Servers_tracking_drop_database">$cfg['Servers'][$i]['tracking_version_drop_database']</span> boolean
    </dt>
    <dd>
-        Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true.
+        Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true.
        <br/><br/>
    </dd>

--- a/import.php
+++ b/import.php
@@ -411,9 +411,11 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
            $message->addParam($executed_queries);

            $message->addString($import_notice);
+            $message->addString('(' . $_FILES['import_file']['name'] . ')');
        } else {
            $message = PMA_Message::success('strImportSuccessfullyFinished');
            $message->addParam($executed_queries);
+            $message->addString('(' . $_FILES['import_file']['name'] . ')');
        }
    }
 }
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -446,7 +446,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D
                                          'CREATE DATABASE,ALTER DATABASE,DROP DATABASE';

 /**
- * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view.
+ * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.
 *
 * @global bool $cfg['Servers'][$i]['tracking_add_drop_view']
 */
@@ -454,7 +454,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D
 $cfg['Servers'][$i]['tracking_add_drop_view'] = true;

 /**
- * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table.
+ * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.
 *
 * @global bool $cfg['Servers'][$i]['tracking_add_drop_table']
 */
@@ -462,7 +462,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true;
 $cfg['Servers'][$i]['tracking_add_drop_table'] = true;

 /**
- * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database.
+ * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.
 *
 * @global bool $cfg['Servers'][$i]['tracking_add_drop_database']
 */
@@ -470,7 +470,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true;
 $cfg['Servers'][$i]['tracking_add_drop_database'] = true;

 /**
- * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database.
+ * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.
 *
 * @global bool $cfg['Servers'][$i]['tracking_version_drop_database']
 */
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png';
 $tabs['import']['link'] = 'server_import.php';
 $tabs['import']['text'] = $strImport;

-$tabs['import']['icon'] = 's_sync.png';
-$tabs['import']['link'] = 'server_synchronize.php';
-$tabs['import']['text'] = $strSynchronize;
+$tabs['synchronize']['icon'] = 's_sync.png';
+$tabs['synchronize']['link'] = 'server_synchronize.php';
+$tabs['synchronize']['text'] = $strSynchronize;

 echo PMA_generate_html_tabs($tabs, array());
 unset($tabs);
--- a/main.php
+++ b/main.php
@@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi
 ?>
    <li><bdo xml:lang="en" dir="ltr">
        [<a href="changelog.php" target="_blank">ChangeLog</a>]
-        [<a href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/"
-            target="_blank">Subversion</a>]
+        [<a href="http://phpmyadmin.git.sourceforge.net/git/gitweb-index.cgi"
+            target="_blank">Git</a>]
        [<a href="http://sourceforge.net/mail/?group_id=23067"
            target="_blank">Lists</a>]
        </bdo>
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -35,37 +35,6 @@ shift
 branch=$1
 shift

-# Create working copy
-mkdir -p release
-workdir=release/phpMyAdmin-$version
-if [ -d $workdir ] ; then
-    echo "Working directory '$workdir' already exists, please move it out of way"
-    exit 1
-fi
-git clone --local . $workdir
-cd $workdir
-
-# Checkout branch
-git checkout $branch
-
-# Check release version
-if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then
-    echo "There seems to be wrong version in libraries/Config.class.php!"
-    exit 2
-fi
-if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then
-    echo "There seems to be wrong version in Documentation.html"
-    exit 2
-fi
-if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then
-    echo "There seems to be wrong version in translators.html"
-    exit 2
-fi
-if ! grep -q "Version $version\$" README ; then
-    echo "There seems to be wrong version in README"
-    exit 2
-fi
-
 cat <<END

 Please ensure you have:
@@ -88,6 +57,36 @@ if [ "$do_release" != 'y' ]; then
    exit 100
 fi

+# Checkout branch
+git checkout $branch
+
+# Check release version
+if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then
+    echo "There seems to be wrong version in libraries/Config.class.php!"
+    exit 2
+fi
+if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then
+    echo "There seems to be wrong version in Documentation.html"
+    exit 2
+fi
+if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then
+    echo "There seems to be wrong version in translators.html"
+    exit 2
+fi
+if ! grep -q "Version $version\$" README ; then
+    echo "There seems to be wrong version in README"
+    exit 2
+fi
+
+# Create working copy
+mkdir -p release
+workdir=release/phpMyAdmin-$version
+if [ -d $workdir ] ; then
+    echo "Working directory '$workdir' already exists, please move it out of way"
+    exit 1
+fi
+git clone --local . $workdir
+cd $workdir

 # Cleanup release dir
 LC_ALL=C date -u > RELEASE-DATE-${version}
@@ -216,8 +215,8 @@ cat <<END
 Todo now:
 ---------

- 1. tag the repository with the new revision number for a plain release
-    or a release candidate:
+1. If not already done, tag the repository with the new revision number 
+   for a plain release or a release candidate:
    version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE
    version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING

--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -13,7 +13,7 @@ require_once './libraries/common.inc.php';
 require_once './libraries/Table.class.php';

 $GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'mootools-more.js';
+$GLOBALS['js_include'][] = 'mootools.js';
 require_once './libraries/header.inc.php';

 // Check parameters