Fixed master merge failure

protected/humhub/docs/CHANGELOG.md

@@ -6,9 +6,6 @@ HumHub Change Log
 
 - Enh: Added BaseURL setting protocol scheme validation
 - Fix #2849: ActiveQueryContent doesn't find public profile content when guest access is enabled
-- Enh: Fixed username alignment in comments (@githubjeka)
-- Enh: More readable WallEntryAddon links (@githubjeka)
-- Fix: Documentation grammar fixes (@Felli)
 
 1.2.4  (December 13, 2017)
 --------------------------

protected/humhub/docs/guide/admin/asynchronous-tasks.md

@@ -8,7 +8,7 @@ To provide a fast and responive user experience, extensive processes are handeld
 
 Some examples for such background processes are:
 
-- Notifications (informing the users via e-mails or mobile push notifications) 
+- Notifications (informing the users via e-ails or mobile push notifications) 
 - Search index rebuilds
 - File indexing
 
@@ -26,7 +26,6 @@ We recommend to switch to the MySQL or Redis driver on production environments.
 ### MySQL Database Driver
 
 If you don't have Redis or any other supported queuing software (RabbitMQ, Beanstalk or Gearman) running, this is the recommended driver.
-
 To enable this driver you need to add following block to your local configuration file (protected/config/common.php):
 
 ```
@@ -51,6 +50,7 @@ To enable this driver you need to add following block to your local configuratio
 If you're already using Redis (e.g. for caching or push) we recommend this queue driver.
 Please make sure you already configured Redis as described here: [Redis Configuration](redis.md).
 
+
 To enable this driver you need to add following block to your local configuration file (protected/config/common.php):
 
 ```
@@ -113,3 +113,4 @@ numprocs=4
 redirect_stderr=true
 stdout_logfile=<INSERT HUMHUB PATH HERE>/protected/runtime/logs/yii-queue-worker.log
 ```
+

protected/humhub/docs/guide/admin/security.md

@@ -5,7 +5,7 @@ Disable Errors / Debugging
 --------------------------
 
  - Modify *index.php* in your humhub root directory
-
+     
 ```php
 [...]
 // comment out the following two lines when deployed to production
@@ -16,19 +16,21 @@ Disable Errors / Debugging
 
  - Delete *index-test.php* in your humhub root directory if exists
 
+
 Protected Directories
 ---------------------
 
-Make sure the following directories are not accessible by web:
+Make sure following directories are not accessible by web:
 - protected
 - uploads/file
 
 By default these folders are protected with a ".htaccess" file.
 
+
 Limit User Access
 -----------------
 
-If you're running a private social network, make sure the user registration has been disabled or the approval system for new users has been enabled.
+If you're running a private social network, make sure the user registration is disabled or the approval system for new users is enabled.
 
 - Disable user registration: `Administration -> Users -> Settings -> Anonymous users can register`
 - Enable user approvals: `Administration -> Users -> Settings -> Require group admin approval after registration`
@@ -37,6 +39,9 @@ If you're running a private social network, make sure the user registration has
 Keep up with the latest HumHub version
 ---------------------------------------
 
-As an admin you'll receive a notification when a new HumHub version has been released. We strongly recommend to always use the latest stable version when possible.
+As admin you'll receive a notification when a new HumHub version is released. We recommend to always use the latest stable version.
+
+We take security very seriously and continuously improving the security features of HumHub. 
+
+
 
-We take security very seriously, and we're continuously improving the security features of HumHub. 

protected/humhub/libs/ActionColumn.php

@@ -96,7 +96,9 @@ class ActionColumn extends Column
      */
     protected function handleUrl($url, $model)
     {
-        $url[$this->modelIdAttribute] = $model->getAttribute($this->modelIdAttribute);
+        if (!isset($url[$this->modelIdAttribute])) {
+            $url[$this->modelIdAttribute] = $model->getAttribute($this->modelIdAttribute);
+        }
 
         return \yii\helpers\Url::to($url);
     }