summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cox Jr <DaveMC08@gmail.com>2013-10-16 20:43:52 +0200
committerDavid Cox Jr <DaveMC08@gmail.com>2013-10-16 20:43:52 +0200
commitabcb67c76ccb384ea213f9c4f42a392b15b3e15e (patch)
treeb833517e8dacff00ace9bc7bfbe676ccdee40426
parent06fa739406e5103298ca72fc67cc41f0f8c6b6f4 (diff)
req. changes:
cleaned up conditionals added changelog note regarding profiler updated as per styleguide
-rw-r--r--system/libraries/Profiler.php19
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 5 insertions, 15 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 80130eb48..50ba1673f 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -307,10 +307,7 @@ class CI_Profiler {
foreach ($_GET as $key => $val)
{
- if ( ! is_numeric($key))
- {
- $key = "'".$key."'";
- }
+ is_int($key) OR $key = "'".$key."'";
$output .= '<tr><td style="width:50%;color:#000;background-color:#ddd;padding:5px;">&#36;_GET['
.$key.']&nbsp;&nbsp; </td><td style="width:50%;padding:5px;color:#cd6e00;font-weight:normal;background-color:#ddd;">'
@@ -338,7 +335,7 @@ class CI_Profiler {
."\n"
.'<legend style="color:#009900;">&nbsp;&nbsp;'.$this->CI->lang->line('profiler_post_data')."&nbsp;&nbsp;</legend>\n";
- if (count($_POST) === 0 AND count($_FILES) === 0)
+ if (count($_POST) === 0 && count($_FILES) === 0)
{
$output .= '<div style="color:#009900;font-weight:normal;padding:4px 0 4px 0;">'.$this->CI->lang->line('profiler_no_post').'</div>';
}
@@ -348,10 +345,7 @@ class CI_Profiler {
foreach ($_POST as $key => $val)
{
- if ( ! is_numeric($key))
- {
- $key = "'".$key."'";
- }
+ is_int($key) OR $key = "'".$key."'";
$output .= '<tr><td style="width:50%;padding:5px;color:#000;background-color:#ddd;">&#36;_POST['
.$key.']&nbsp;&nbsp; </td><td style="width:50%;padding:5px;color:#009900;font-weight:normal;background-color:#ddd;">';
@@ -370,10 +364,7 @@ class CI_Profiler {
foreach ($_FILES as $key => $val)
{
- if ( ! is_numeric($key))
- {
- $key = "'".$key."'";
- }
+ is_int($key) OR $key = "'".$key."'";
$output .= '<tr><td style="width:50%;padding:5px;color:#000;background-color:#ddd;">&#36;_FILES['
.$key.']&nbsp;&nbsp; </td><td style="width:50%;padding:5px;color:#009900;font-weight:normal;background-color:#ddd;">';
@@ -389,8 +380,6 @@ class CI_Profiler {
$output .= "</table>\n";
}
-
-
return $output.'</fieldset>';
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a66fb265f..052624076 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -351,6 +351,7 @@ Release Date: Not Released
- Database object names are now being displayed.
- The sum of all queries running times in seconds is now being displayed.
- Added support for displaying the HTTP DNT ("Do Not Track") header.
+ - Added support for displaying $_FILES.
- :doc:`Migration Library <libraries/migration>` changes include: