Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

config.sample.inc.php

@@ -132,7 +132,6 @@ $cfg['SaveDir'] = '';
 /**
  * When using DB-based query history, how many entries should be kept?
  *
- * @global integer $cfg['QueryHistoryMax']
  * default = 25
  */
 //$cfg['QueryHistoryMax'] = 100;

db_qbe.php

@@ -141,7 +141,7 @@ $realwidth = $form_column_width . 'ex';
  * Enter description here...
  *
  * @param array     $columns
- * @param numeric   $column_number
+ * @param integer   $column_number
  * @param string    $selected
  */
 function showColumnSelectCell($columns, $column_number, $selected = '')

db_tracking.php

@@ -5,7 +5,9 @@
  * @package phpMyAdmin
  */
 
-// Run common work
+/**
+ * Run common work
+ */
 require_once './libraries/common.inc.php';
 require_once './libraries/Table.class.php';
 

libraries/import/upload/apc.php

@@ -12,6 +12,11 @@ if (! defined('PHPMYADMIN')) {
 
 $ID_KEY      = 'APC_UPLOAD_PROGRESS';
 
+/**
+ * Returns upload status.
+ *
+ * This is implementation for APC extension.
+ */
 function PMA_getUploadStatus($id) {
     global $SESSION_KEY;
     global $ID_KEY;

libraries/import/upload/noplugin.php

@@ -12,6 +12,11 @@ if (! defined('PHPMYADMIN')) {
 
 $ID_KEY      = 'noplugin';
 
+/**
+ * Returns upload status.
+ *
+ * This is implementation when no webserver support exists, so it returns just zeroes.
+ */
 function PMA_getUploadStatus($id) {
     global $SESSION_KEY;
     global $ID_KEY;

libraries/import/upload/uploadprogress.php

@@ -11,6 +11,11 @@ if (! defined('PHPMYADMIN')) {
 
 $ID_KEY = "UPLOAD_IDENTIFIER";
 
+/**
+ * Returns upload status.
+ *
+ * This is implementation for uploadprogress extension.
+ */
 function PMA_getUploadStatus($id) {
     global $SESSION_KEY;
     global $ID_KEY;

libraries/logging.lib.php

@@ -9,6 +9,9 @@
  * @package phpMyAdmin
  */
 
+/**
+ * Logs user information to webserver logs.
+ */
 function PMA_log_user($user, $status = 'ok'){
     if (function_exists('apache_note')) {
         apache_note('userID', $user);

libraries/select_lang.lib.php

@@ -139,7 +139,7 @@ function PMA_langSet(&$lang)
  *
  * @return  bool    true on success, otherwise false
  *
- * @global  array $available_languages
+ * @uses    $GLOBALS['available_languages'] to check $lang
  *
  * @access  private
  */

pdf_schema.php

@@ -99,11 +99,11 @@ class PMA_PDF extends TCPDF {
     /**
      * Sets the scaling factor, defines minimum coordinates and margins
      *
-     * @param double $ The scaling factor
+     * @param double scale The scaling factor
-     * @param double $ The minimum X coordinate
+     * @param double x_min The minimum X coordinate
-     * @param double $ The minimum Y coordinate
+     * @param double y_min The minimum Y coordinate
-     * @param double $ The left margin
+     * @param double l_marg The left margin
-     * @param double $ The top margin
+     * @param double t_marg The top margin
      * @access public
      */
     function PMA_PDF_setScale($scale = 1, $x_min = 0, $y_min = 0, $l_marg = -1, $t_marg = -1)