miscellaneous fixes; Fix #875

concretecms · Feb 28, 2015 · f7d0f14 · f7d0f14
1 parent 6fed319
commit f7d0f14
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/web/concrete/blocks/page_list/controller.php b/web/concrete/blocks/page_list/controller.php
@@ -223,7 +223,6 @@ protected function loadKeys()
 
     public function action_filter_by_topic($treeNodeID = false, $topic = false)
     {
-        $db = Loader::db();
         if ($treeNodeID) {
             $this->list->filterByTopic(intval($treeNodeID));
             $topicObj = Topic::getByID(intval($treeNodeID));

diff --git a/web/concrete/controllers/backend/page.php b/web/concrete/controllers/backend/page.php
@@ -1,5 +1,6 @@
 <?
 namespace Concrete\Controller\Backend;
+use Concrete\Core\Http\Response;
 use Controller;
 use PageType, Permissions, Loader, Redirect;
 use Page as ConcretePage;
@@ -48,7 +49,7 @@ public function exitEditMode($cID, $token)
             return Redirect::page($c);
         }
 
-        return new Response(t('Access Denied'));
+        return new \Response(t('Access Denied'));
     }
 
 	public function getJSON() {

diff --git a/web/concrete/elements/conversation/display.php b/web/concrete/elements/conversation/display.php
@@ -107,9 +107,9 @@
 	<div class="ccm-conversation-messages-header">
 		<? if ($enableOrdering) { ?>
 		<select class="form-control pull-right ccm-sort-conversations" data-sort="conversation-message-list">
-			<option value="date_desc" <? if ($orderBy == 'date_desc') { ?>selected="selected"<? } ?>><?=t('Recent')?></option>
-			<option value="date_asc" <? if ($orderBy == 'date_asc') { ?>selected="selected"<? } ?>><?=t('Oldest')?></option>
-			<option value="rating" <? if ($orderBy == 'rating') { ?>selected="selected"<? } ?>><?=t('Popular')?></option>
+			<option value="date_asc" <? if ($orderBy == 'date_asc') { ?>selected="selected"<? } ?>><?=t('Earliest First')?></option>
+			<option value="date_desc" <? if ($orderBy == 'date_desc') { ?>selected="selected"<? } ?>><?=t('Most Recent First')?></option>
+			<option value="rating" <? if ($orderBy == 'rating') { ?>selected="selected"<? } ?>><?=t('Highest Rated')?></option>
 		</select>
 		<? } ?>
 

diff --git a/web/concrete/src/Routing/ControllerRouteCallback.php b/web/concrete/src/Routing/ControllerRouteCallback.php
@@ -23,7 +23,7 @@ public function execute(Request $request, Route $route, $parameters) {
 		$method = $callback[1];
 		$controller->on_start();
 		$response = $controller->runAction($method, $arguments);
-		if ($response instanceof Response || $response instanceof RedirectResponse) {
+		if ($response instanceof \Concrete\Core\Http\Response || $response instanceof RedirectResponse) {
 			// note, our RedirectResponse doesn't extend Response, it extends symfony2 response
 			return $response;
 		}