From bd3cf8cda838810e19aad11d3c02df3827fe61a2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 17 Jun 2012 08:31:34 -0400 Subject: [PATCH 1/5] Clarify possible return values --- libraries/File.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index bcdcb1e56e..98c1f08f8e 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -159,7 +159,8 @@ class PMA_File /** * Gets file content * - * @return string binary file content + * @return mixed the binary file content as a string, + * or false if no content * * @access public */ From dbc7758f12c78b9c0242e004e4e20c73e5f907ef Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 17 Jun 2012 08:39:31 -0400 Subject: [PATCH 2/5] PMA_generateHtmlTabs() becomes PMA_getHtmlTabs() --- libraries/Menu.class.php | 2 +- libraries/TableSearch.class.php | 2 +- libraries/common.lib.php | 2 +- querywindow.php | 2 +- test/theme.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index f1b192929e..ef56ec2f74 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -103,7 +103,7 @@ class PMA_Menu } else { $tabs = $this->_getServerTabs(); } - return PMA_generateHtmlTabs($tabs, $url_params); + return PMA_getHtmlTabs($tabs, $url_params); } /** diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index 14624009aa..b8b55a4086 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -1068,7 +1068,7 @@ EOT; $url_params['db'] = $this->_db; $url_params['table'] = $this->_table; - $html_output .= PMA_generateHtmlTabs( + $html_output .= PMA_getHtmlTabs( $this->_getSubTabs(), $url_params, 'topmenu2' ); $html_output .= $this->_getFormTag($goto); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 77bb491e4e..bf70f974b0 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1786,7 +1786,7 @@ function PMA_generateHtmlTab($tab, $url_params = array()) * * @return string html-code for tab-navigation */ -function PMA_generateHtmlTabs($tabs, $url_params, $menu_id = 'topmenu') +function PMA_getHtmlTabs($tabs, $url_params, $menu_id = 'topmenu') { $tab_navigation = '
' diff --git a/querywindow.php b/querywindow.php index 8ba3530c3e..af294e5e17 100644 --- a/querywindow.php +++ b/querywindow.php @@ -135,7 +135,7 @@ if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') { echo '
'; if ($tabs) { - echo PMA_generateHtmlTabs($tabs, array()); + echo PMA_getHtmlTabs($tabs, array()); unset($tabs); } diff --git a/test/theme.php b/test/theme.php index d6aa6f7851..c36bc770b2 100644 --- a/test/theme.php +++ b/test/theme.php @@ -143,7 +143,7 @@ $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = 'active'; $tabs['import']['class'] = 'active'; -echo PMA_generateHtmlTabs($tabs, array()); +echo PMA_getHtmlTabs($tabs, array()); unset($tabs); if (@file_exists($pmaThemeImage . 'logo_right.png')) { From 7510ba77f8a2db8616a9246e37212a015927fe2d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 17 Jun 2012 08:42:09 -0400 Subject: [PATCH 3/5] PMA_generateHtmlTab() becomes PMA_getHtmlTab() --- libraries/common.lib.php | 6 +++--- libraries/user_preferences.inc.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index bf70f974b0..edade08500 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1684,7 +1684,7 @@ function PMA_localisedDate($timestamp = -1, $format = '') * * @access public */ -function PMA_generateHtmlTab($tab, $url_params = array()) +function PMA_getHtmlTab($tab, $url_params = array()) { // default values $defaults = array( @@ -1775,7 +1775,7 @@ function PMA_generateHtmlTab($tab, $url_params = array()) $out .= ''; return $out; -} // end of the 'PMA_generateHtmlTab()' function +} // end of the 'PMA_getHtmlTab()' function /** * returns html-code for a tab navigation @@ -1793,7 +1793,7 @@ function PMA_getHtmlTabs($tabs, $url_params, $menu_id = 'topmenu') .'
    '; foreach ($tabs as $tab) { - $tab_navigation .= PMA_generateHtmlTab($tab, $url_params); + $tab_navigation .= PMA_getHtmlTab($tab, $url_params); } $tab_navigation .= diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 9e81795a03..e570c30a62 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -23,7 +23,7 @@ $tabs_icons = array( 'Import' => 'b_import.png', 'Export' => 'b_export.png'); echo '
      '; -echo PMA_generateHtmlTab( +echo PMA_getHtmlTab( array( 'link' => 'prefs_manage.php', 'text' => __('Manage your settings') @@ -37,7 +37,7 @@ foreach (array_keys($forms) as $formset) { 'text' => PMA_lang('Form_' . $formset), 'icon' => $tabs_icons[$formset], 'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param)); - echo PMA_generateHtmlTab($tab, array('form' => $formset)) . "\n"; + echo PMA_getHtmlTab($tab, array('form' => $formset)) . "\n"; } echo '
    '; From 317fd703976380a3a7e6cd971659fae0d591ebab Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 17 Jun 2012 09:06:32 -0400 Subject: [PATCH 4/5] Fix fatal error when running phpunit --- libraries/error.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/error.inc.php b/libraries/error.inc.php index b6df839632..22b7474ee9 100644 --- a/libraries/error.inc.php +++ b/libraries/error.inc.php @@ -14,6 +14,7 @@ if (! defined('TESTSUITE')) { header('Content-Type: text/html; charset=utf-8'); } +include_once 'libraries/Response.class.php'; PMA_Response::getInstance()->disable(); ?> From 547282a240b1686968e25ce5eb2702b392dac741 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sun, 17 Jun 2012 22:05:07 +0100 Subject: [PATCH 5/5] Fixed missing function argument in the PMA_Scripts class --- libraries/Scripts.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/Scripts.class.php b/libraries/Scripts.class.php index 604f310ede..7fae5abf50 100644 --- a/libraries/Scripts.class.php +++ b/libraries/Scripts.class.php @@ -153,6 +153,7 @@ class PMA_Scripts foreach ($this->_files as $file) { $retval .= $this->_includeFile( $file['filename'], + $file['timestamp'], $file['conditional_ie'] ); }