Merge pull request #2447 from rlerdorf/develop

A few minor fixes and cleanups

4 files changed, 10 insertions, 10 deletions

diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 773a58384..6d2b99bbf 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -172,7 +172,7 @@ class CI_Javascript {
 	 */
 	public function focus($element = 'this', $js = '')
 	{
-		return $this->js->__add_event($focus, $js);
+		return $this->js->__add_event($element, $js);
 	}
 
 	// --------------------------------------------------------------------
@@ -187,7 +187,7 @@ class CI_Javascript {
 	 * @param	string	- Javascript code for mouse out
 	 * @return	string
 	 */
-	public function hover($element = 'this', $over, $out)
+	public function hover($element = 'this', $over = '', $out = '')
 	{
 		return $this->js->__hover($element, $over, $out);
 	}
@@ -844,4 +844,4 @@ class CI_Javascript {
 }
 
 /* End of file Javascript.php */
-/* Location: ./system/libraries/Javascript.php */
\ No newline at end of file
+/* Location: ./system/libraries/Javascript.php */
diff --git a/system/libraries/Javascript/Jquery.php b/system/libraries/Javascript/Jquery.php
index b6e0434b2..2b0cc08e6 100644
--- a/system/libraries/Javascript/Jquery.php
+++ b/system/libraries/Javascript/Jquery.php
@@ -225,7 +225,7 @@ class CI_Jquery extends CI_Javascript {
 	 * @param	string	- Javascript code for mouse out
 	 * @return	string
 	 */
-	protected function _hover($element = 'this', $over, $out)
+	protected function _hover($element = 'this', $over = '', $out = '')
 	{
 		$event = "\n\t$(".$this->_prep_element($element).").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
 
@@ -715,7 +715,7 @@ class CI_Jquery extends CI_Javascript {
 	 * @return	string
 	 */
 
-	protected function _updater($container = 'this', $controller, $options = '')
+	protected function _updater($container = 'this', $controller = '', $options = '')
 	{
 		$container = $this->_prep_element($container);
 		$controller = (strpos('://', $controller) === FALSE) ? $controller : $this->CI->config->site_url($controller);
@@ -1066,4 +1066,4 @@ class CI_Jquery extends CI_Javascript {
 }
 
 /* End of file Jquery.php */
-/* Location: ./system/libraries/Jquery.php */
\ No newline at end of file
+/* Location: ./system/libraries/Jquery.php */
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 0c60efb8b..ed64f0a59 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -264,7 +264,7 @@ class CI_Profiler {
 				foreach ($db->queries as $key => $val)
 				{
 					$time = number_format($db->query_times[$key], 4);
-					$val = highlight_code($val, ENT_QUOTES);
+					$val = highlight_code($val);
 
 					foreach ($highlight as $bold)
 					{
@@ -554,4 +554,4 @@ class CI_Profiler {
 }
 
 /* End of file Profiler.php */
-/* Location: ./system/libraries/Profiler.php */
\ No newline at end of file
+/* Location: ./system/libraries/Profiler.php */
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 9e60791ae..2675f724e 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -446,7 +446,7 @@ class CI_Xmlrpc {
 				{
 					while (list($k) = each($value[0]))
 					{
-						$value[0][$k] = $this->values_parsing($value[0][$k], TRUE);
+						$value[0][$k] = $this->values_parsing($value[0][$k]);
 					}
 				}
 
@@ -1848,4 +1848,4 @@ class XML_RPC_Values extends CI_Xmlrpc
 } // END XML_RPC_Values Class
 
 /* End of file Xmlrpc.php */
-/* Location: ./system/libraries/Xmlrpc.php */
\ No newline at end of file
+/* Location: ./system/libraries/Xmlrpc.php */