From 6dca42107e3c16cb886bc470953e71fbe4aa3503 Mon Sep 17 00:00:00 2001
From: Piotr Przybylski <piotrprz@gmail.com>
Date: Tue, 16 Aug 2011 14:18:15 +0200
Subject: [PATCH] Fix comments in upload progress libs and add make returns
 consistent

---
 libraries/import/upload/apc.php            | 5 ++++-
 libraries/import/upload/noplugin.php       | 5 ++++-
 libraries/import/upload/uploadprogress.php | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php
index 5250c92255..5fe34bb220 100644
--- a/libraries/import/upload/apc.php
+++ b/libraries/import/upload/apc.php
@@ -15,6 +15,9 @@ $ID_KEY      = 'APC_UPLOAD_PROGRESS';
  * Returns upload status.
  *
  * This is implementation for APC extension.
+ *
+ * @param string $id
+ * @return array|null
  */
 function PMA_getUploadStatus($id)
 {
@@ -22,7 +25,7 @@ function PMA_getUploadStatus($id)
     global $ID_KEY;
 
     if (trim($id) == "") {
-        return;
+        return null;
     }
     if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) {
         $_SESSION[$SESSION_KEY][$id] = array(
diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php
index fa7796c686..00dcb11443 100644
--- a/libraries/import/upload/noplugin.php
+++ b/libraries/import/upload/noplugin.php
@@ -15,6 +15,9 @@ $ID_KEY      = 'noplugin';
  * Returns upload status.
  *
  * This is implementation when no webserver support exists, so it returns just zeroes.
+ *
+ * @param string $id
+ * @return array|null
  */
 function PMA_getUploadStatus($id)
 {
@@ -22,7 +25,7 @@ function PMA_getUploadStatus($id)
     global $ID_KEY;
 
     if (trim($id) == "") {
-        return;
+        return null;
     }
     if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) {
         $_SESSION[$SESSION_KEY][$id] = array(
diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php
index a3ec60b1de..d5c361c1d4 100644
--- a/libraries/import/upload/uploadprogress.php
+++ b/libraries/import/upload/uploadprogress.php
@@ -14,6 +14,9 @@ $ID_KEY = "UPLOAD_IDENTIFIER";
  * Returns upload status.
  *
  * This is implementation for uploadprogress extension.
+ *
+ * @param string $id
+ * @return array|null
  */
 function PMA_getUploadStatus($id)
 {
@@ -21,7 +24,7 @@ function PMA_getUploadStatus($id)
     global $ID_KEY;
 
     if (trim($id) == "") {
-        return;
+        return null;
     }
 
     if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-- 
2.11.4.GIT