Bug fix on recent sorting commits.

application/modules/requests/controllers/IndexController.php

@@ -52,12 +52,13 @@ class Requests_IndexController extends App_Controller_Action
 		}
 		if ($in['sortBy']) {
 			$oldSortByKey = array_search($in['sortBy'], $session->sortBy);
-			unset($session->sortBy[$oldSortByKey]);
+			if ($oldSortByKey !== false) {
+                unset($session->sortBy[$oldSortByKey]);
+			}
 			array_unshift($session->sortBy, $in['sortBy']);
 		}
 		
 		
-		
 		$sortKeys = array();
 		$userRequestsData = array();
 		foreach ($userRequests as $requestId => $userRequest)
@@ -78,7 +79,11 @@ class Requests_IndexController extends App_Controller_Action
             }
             foreach ($session->sortBy as $key => $sortBy) {
 	            if ($sortBy == 'courseCode') {
-	                $sortKeys[$key][] = $request['currentCourse']->getCourseCode();
+	            	if ($request['parentCourse']) {
+                        $sortKeys[$key][] = $request['parentCourse']->getCourseCode();
+	            	} else {
+	            		$sortKeys[$key][] = $request['currentCourse']->getCourseCode();
+	            	}
 	            } else if ($sortBy == 'college') {
 	                $sortKeys[$key][] = $request['currentCourse']->getCollege();
 	            } else if ($sortBy == 'requestType') {
@@ -115,7 +120,11 @@ class Requests_IndexController extends App_Controller_Action
                     }
 		            foreach ($session->sortBy as $key => $sortBy) {
 		                if ($sortBy == 'courseCode') {
-		                    $sortKeys[$key][] = $request['currentCourse']->getCourseCode();
+		                    if ($request['parentCourse']) {
+		                        $sortKeys[$key][] = $request['parentCourse']->getCourseCode();
+		                    } else {
+		                        $sortKeys[$key][] = $request['currentCourse']->getCourseCode();
+		                    }
 		                } else if ($sortBy == 'college') {
 		                    $sortKeys[$key][] = $request['currentCourse']->getCollege();
 		                } else if ($sortBy == 'requestType') {
@@ -146,7 +155,11 @@ class Requests_IndexController extends App_Controller_Action
                     }
 		            foreach ($session->sortBy as $key => $sortBy) {
 		                if ($sortBy == 'courseCode') {
-		                    $sortKeys[$key][] = $request['currentCourse']->getCourseCode();
+		                    if ($request['parentCourse']) {
+		                        $sortKeys[$key][] = $request['parentCourse']->getCourseCode();
+		                    } else {
+		                        $sortKeys[$key][] = $request['currentCourse']->getCourseCode();
+		                    }
 		                } else if ($sortBy == 'college') {
 		                    $sortKeys[$key][] = $request['currentCourse']->getCollege();
 		                } else if ($sortBy == 'requestType') {