Merge remote-tracking branch 'upstream/master'

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
      */

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);
     }
 
     /**

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']
             );
         }

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);

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 .= '</li>';
     return $out;
-} // end of the 'PMA_generateHtmlTab()' function
+} // end of the 'PMA_getHtmlTab()' function
 
 /**
  * returns html-code for a tab navigation
@@ -1786,14 +1786,14 @@ 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 = '<div id="' . htmlentities($menu_id)
         . 'container" class="menucontainer">'
         .'<ul id="' . htmlentities($menu_id) . '">';
 
     foreach ($tabs as $tab) {
-        $tab_navigation .= PMA_generateHtmlTab($tab, $url_params);
+        $tab_navigation .= PMA_getHtmlTab($tab, $url_params);
     }
 
     $tab_navigation .=

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();
 
 ?>

libraries/user_preferences.inc.php

@@ -23,7 +23,7 @@ $tabs_icons = array(
     'Import'      => 'b_import.png',
     'Export'      => 'b_export.png');
 echo '<ul id="topmenu2">';
-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 '</ul><div class="clearfloat"></div>';
 

querywindow.php

@@ -135,7 +135,7 @@ if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') {
 echo '<div id="querywindowcontainer">';
 
 if ($tabs) {
-    echo PMA_generateHtmlTabs($tabs, array());
+    echo PMA_getHtmlTabs($tabs, array());
     unset($tabs);
 }
 

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')) {