The branch, QA_3_3 has been updated
via 7b831bc8777c3f8195d33f3e7720d8123f3d9ce2 (commit)
via e5ab5e637e6e09dec98a4ec7656818b2c71b022c (commit)
via 3e5c8f9f01042c42f6a656e06fd2bc61fe5786a5 (commit)
from f0672d82c38af1593523e2271f4cadcd27e64e39 (commit)
- Log -----------------------------------------------------------------
commit 7b831bc8777c3f8195d33f3e7720d8123f3d9ce2
Merge: f0672d82c38af1593523e2271f4cadcd27e64e39 e5ab5e637e6e09dec98a4ec7656818b2c71b022c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon Mar 15 16:36:48 2010 -0400
Merge branch 'MAINT_3_3_1' into QA_3_3
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_addfield.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1594d49..f16bfb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,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,
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 886b939..cfa25f5 100644
--- 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
hooks/post-receive
--
phpMyAdmin