The branch, master has been updated
via e459494e708f3269ede2ee5da2bdfd43c85c2ca0 (commit)
via ea8a2bbc4f8f1486d4253f98391021adda7b0174 (commit)
from e4b6f71162776574832ceb5f6b8dea14afb8ce3e (commit)
- Log -----------------------------------------------------------------
commit e459494e708f3269ede2ee5da2bdfd43c85c2ca0
Merge: ea8a2bbc4f8f1486d4253f98391021adda7b0174 e4b6f71162776574832ceb5f6b8dea14afb8ce3e
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Dec 19 06:22:36 2010 -0500
Merge branch 'master' of
ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit ea8a2bbc4f8f1486d4253f98391021adda7b0174
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Dec 19 06:22:06 2010 -0500
Missing jquery library which is referenced in js/functions.js
-----------------------------------------------------------------------
Summary of changes:
browse_foreigners.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 4b07400..3b8211d 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -93,7 +93,10 @@ if (is_array($foreignData['disp_row'])) {
<meta http-equiv="Content-Type" content="text/html;
charset=<?php echo $charset; ?>" />
<link rel="stylesheet" type="text/css"
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('',
''); ?>&js_frame=right&nocache=<?php echo
$GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
- <script src="./js/functions.js"
type="text/javascript"></script>
+<?php
+// includes everything asked for by libraries/common.inc.php
+require_once './libraries/header_scripts.inc.php';
+?>
<script type="text/javascript">
//<![CDATA[
self.focus();
hooks/post-receive
--
phpMyAdmin