Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Correct Arrays

  • Loading branch information...
commit 6a4805f7f603cdfc71741978dd64ef7536ea722e 1 parent e44aa4b
@hedcler authored
Showing with 12 additions and 0 deletions.
  1. +12 −0 system/core/Input.php
View
12 system/core/Input.php
@@ -217,8 +217,12 @@ public function put($index = NULL, $xss_clean = FALSE) {
return $put;
}
+<<<<<<< HEAD
return $this->_fetch_from_array($this->http_put_data, $index, $xss_clean);
+=======
+ return $this->_fetch_from_array($_REQUEST, $index, $xss_clean);
+>>>>>>> Correct Arrays
}
@@ -244,13 +248,21 @@ public function delete($index = NULL, $xss_clean = FALSE) {
// Loop through the full delete args array and return it
foreach (array_keys($this->http_delete_data) as $key)
{
+<<<<<<< HEAD
$put[$key] = $this->_fetch_from_array($this->http_delete_data, $key, $xss_clean);
+=======
+ $put[$key] = $this->_fetch_from_array($_PUT, $key, $xss_clean);
+>>>>>>> Correct Arrays
}
return $put;
}
+<<<<<<< HEAD
return $this->_fetch_from_array($this->http_delete_data, $index, $xss_clean);
+=======
+ return $this->_fetch_from_array($_PUT, $index, $xss_clean);
+>>>>>>> Correct Arrays
}

0 comments on commit 6a4805f

Please sign in to comment.
Something went wrong with that request. Please try again.