From fe29a57cdbcdd1e8fc7169ce06231a63afe327d0 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Wed, 26 Nov 2014 09:36:41 +0000
Subject: [PATCH] Only include this chunk if githubDIff is true

---
 lib/file-control.php | 50 +++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/lib/file-control.php b/lib/file-control.php
index e2c7d97..0fcc89c 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -376,35 +376,37 @@ if (action=="load") {
 				top.ICEcoder.setLayout();
 				top.ICEcoder.content.contentWindow.createNewCMInstance(top.ICEcoder.nextcMInstance);
 
-				// If we're in GitHub diff mode and have a split pane display, get the content for the diff pane
-				if (top.ICEcoder.githubDiff && top.ICEcoder.splitPane) {
-					<?php
-					// Get our GitHub relative site path & local path
-					$ghRemoteURLPos = array_search($ICEcoder["root"],$ICEcoder['githubLocalPaths']);
+				<?php if ($_SESSION['githubDiff']) { ?>
+					// If we're in GitHub diff mode and have a split pane display, get the content for the diff pane
+					if (top.ICEcoder.githubDiff && top.ICEcoder.splitPane) {
+						<?php
+						// Get our GitHub relative site path & local path
+						$ghRemoteURLPos = array_search($ICEcoder["root"],$ICEcoder['githubLocalPaths']);
 
-					$ghLocalURLPaths = $ICEcoder['githubLocalPaths'];
-					$ghLocalPath = $ghLocalURLPaths[$ghRemoteURLPos];
+						$ghLocalURLPaths = $ICEcoder['githubLocalPaths'];
+						$ghLocalPath = $ghLocalURLPaths[$ghRemoteURLPos];
 
-					$ghRemoteURLPaths = $ICEcoder['githubRemotePaths'];
-					$ghRemoteURL = $ghRemoteURLPaths[$ghRemoteURLPos];
+						$ghRemoteURLPaths = $ICEcoder['githubRemotePaths'];
+						$ghRemoteURL = $ghRemoteURLPaths[$ghRemoteURLPos];
 
-					$ghRemoteURL = str_replace("https://github.com/","",$ghRemoteURL);
-					$ghRemoteURL = str_replace("/","|",$ghRemoteURL);
+						$ghRemoteURL = str_replace("https://github.com/","",$ghRemoteURL);
+						$ghRemoteURL = str_replace("/","|",$ghRemoteURL);
 
-					// If the file is not in a sub-sub dir of the doc root
-					if (!strpos($fileLoc,"/",1)) {
-						// The file path is simply the file name in the root
-						$ghFilePath = $fileName;
-					} else {
-						// We need to get rid of the root dir and trailing slash
-						$ghFilePath = substr(str_replace($ghLocalPath,"",$fileLoc),1);
-						// If it's not within a sub-dir, it's just the filename, otherwise prefix with dir path and pipe
-						$ghFilePath = $ghFilePath == "" ? $fileName : $ghFilePath."|".$fileName;
+						// If the file is not in a sub-sub dir of the doc root
+						if (!strpos($fileLoc,"/",1)) {
+							// The file path is simply the file name in the root
+							$ghFilePath = $fileName;
+						} else {
+							// We need to get rid of the root dir and trailing slash
+							$ghFilePath = substr(str_replace($ghLocalPath,"",$fileLoc),1);
+							// If it's not within a sub-dir, it's just the filename, otherwise prefix with dir path and pipe
+							$ghFilePath = $ghFilePath == "" ? $fileName : $ghFilePath."|".$fileName;
+						}
+						?>
+
+						top.ICEcoder.filesFrame.contentWindow.frames['processControl'].location.href = "github.php?action=read&repo=<?php echo $ghRemoteURL;?>&filePath=<?php echo $ghFilePath;?>&csrf="+top.ICEcoder.csrf;
 					}
-					?>
-
-					top.ICEcoder.filesFrame.contentWindow.frames['processControl'].location.href = "github.php?action=read&repo=<?php echo $ghRemoteURL;?>&filePath=<?php echo $ghFilePath;?>&csrf="+top.ICEcoder.csrf;
-				}
+				<?php ;}; ?>
 
 				// Set the value & innerHTML of the code textarea to that of our loaded file plus make it visible (it's hidden on ICEcoder's load)
 				top.ICEcoder.switchMode();