Merge pull request preinheimer#25 from hradtke/patch-2

Fix _zhprof typos.
mrgatt · Nov 29, 2011 · 17b4738 · 17b4738
2 parents 8c8d311 + 0792280
commit 17b4738
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/xhprof_lib/templates/single_run_header_block.phtml b/xhprof_lib/templates/single_run_header_block.phtml
@@ -12,7 +12,7 @@
             $format_total= number_format($totals['ct']);
         }
 
-		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 			$cookieArr =  unserialize($xhprof_runs_impl->run_details['cookie']);
 			$getArr =  unserialize($xhprof_runs_impl->run_details['get']);
 			$postArr =  unserialize($xhprof_runs_impl->run_details['post']);

diff --git a/xhprof_lib/utils/xhprof_runs_mysqli.php b/xhprof_lib/utils/xhprof_runs_mysqli.php
@@ -258,7 +258,7 @@ public function get_run($run_id, $type, &$run_desc)
     $data = mysqli_fetch_assoc($resultSet);
 
     //The Performance data is compressed lightly to avoid max row length
-	if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+	if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 		$contents = unserialize(gzuncompress($data['perfdata']));
 	} else {
 		$contents = json_decode(gzuncompress($data['perfdata']), true);
@@ -391,7 +391,7 @@ public function save_run($xhprof_data, $type, $run_id = null, $xhprof_details =
 		
 		*/
 
-		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 			$sql['get'] = mysqli_real_escape_string($this->linkID, serialize($_GET));
 			$sql['cookie'] = mysqli_real_escape_string($this->linkID, serialize($_COOKIE));
 
@@ -425,7 +425,7 @@ public function save_run($xhprof_data, $type, $run_id = null, $xhprof_details =
 
 		// The value of 2 seems to be light enugh that we're not killing the server, but still gives us lots of breathing room on 
 		// full production code. 
-		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 			$sql['data'] = mysqli_real_escape_string($this->linkID, gzcompress(serialize($xhprof_data), 2));
 		} else {
 			$sql['data'] = mysqli_real_escape_string($this->linkID, gzcompress(json_encode($xhprof_data), 2));

diff --git a/xhprof_lib/utils/xhprof_runs_pdo.php b/xhprof_lib/utils/xhprof_runs_pdo.php
@@ -259,7 +259,7 @@ public function get_run($run_id, $type, &$run_desc)
     $data = $resultSet->fetch(); 
 
     //The Performance data is compressed lightly to avoid max row length
-	if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+	if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 		$contents = unserialize(gzuncompress($data['perfdata']));
 	} else {
 		$contents = json_decode(gzuncompress($data['perfdata']), true);
@@ -391,7 +391,7 @@ public function save_run($xhprof_data, $type, $run_id = null, $xhprof_details =
 		
 		*/
 
-		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 			$sql['get'] = $this->db->quote(serialize($_GET));
 			$sql['cookie'] = $this->db->quote(serialize($_COOKIE));
 
@@ -428,7 +428,7 @@ public function save_run($xhprof_data, $type, $run_id = null, $xhprof_details =
 
 		// The value of 2 seems to be light enugh that we're not killing the server, but still gives us lots of breathing room on 
 		// full production code. 
-		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_zhprof']['serializer'] == 'php')) {
+		if (!isset($GLOBALS['_xhprof']['serializer']) || strtolower($GLOBALS['_xhprof']['serializer'] == 'php')) {
 			$sql['data'] = $this->db->quote(gzcompress(serialize($xhprof_data), 2));
 		} else {
 			$sql['data'] = $this->db->quote(gzcompress(json_encode($xhprof_data), 2));