Merge branch 'hotfix/CEP-757'

Author: svenhoutmeyers

culturefeed.helpers.inc

@@ -58,12 +58,13 @@ function culturefeed_create_user($cf_account, $user = NULL) {
     if (!$cf_account || empty($cf_account->nick)) {
       return FALSE;
     }
-    
-    $uid = db_query("SELECT uid FROM {culturefeed_user} cfu WHERE cfu.uid = :uid", array(':uid' => $user->uid))->fetchField();
 
-    if (isset($user->uid) && $user->uid && $user->uid != $uid) {
+    if (isset($user->uid) && $user->uid) {
       // User is already Drupaluser, so map his Drupal and CultureFeed account
-      $account = $user;
+      $uid = db_query("SELECT uid FROM {culturefeed_user} cfu WHERE cfu.uid = :uid", array(':uid' => $user->uid))->fetchField();
+      if ($user->uid != $uid) {
+        $account = $user;
+      }
     }
     else {
 

culturefeed_pages/includes/helpers.inc

@@ -375,6 +375,7 @@ function culturefeed_pages_get_activities_from_page(CultureFeed_Cdb_Item_Page $p
   $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event OR type:production');
   $parameters[] = new \CultuurNet\Search\Parameter\Query('"' . $page->getId() . '"');
   $parameters[] = new \CultuurNet\Search\Parameter\Start($page_nr);
+  $parameters[] = new \CultuurNet\Search\Parameter\Sort('startdate', 'asc');
 
   try {
     return culturefeed_get_search_service()->search($parameters);

lib/Drupal/DrupalCultureFeedBase.php

@@ -114,7 +114,7 @@ protected static function setAvailableCategories(CultureFeed_User $user) {
     if (!empty($pageFollowing)) {
       foreach ($user->following as $key => $following) {
 
-        $categories = $membership->page->getCategories();
+        $categories = $following->page->getCategories();
 
         // Set a flag to indicate this page can be used.
         $use = FALSE;