Fixed merge issues

thorsten · thorsten · commit f885a947f9d4 · 2014-05-02T04:20:37.000+02:00
diff --git a/phpmyfaq/admin/footer.php b/phpmyfaq/admin/footer.php
@@ -67,7 +67,8 @@
 } else {
     $templateVars['wysiwygActive'] = false;
 
-$twig->loadTemplate('footer.twig')
-    ->display($templateVars);
+    $twig->loadTemplate('footer.twig')
+         ->display($templateVars);
 
-unset($templateVars, $wysiwygActions);
+    unset($templateVars, $wysiwygActions);
+}
diff --git a/phpmyfaq/admin/header.php b/phpmyfaq/admin/header.php
@@ -59,7 +59,7 @@
 }
 
 $adminMenuBuilder = new AdminMenuBuilder($twig);
-$adminMenuBuilder->->setUser($user);
+$adminMenuBuilder->setUser($user);
 
 switch ($action) {
     case 'user':
diff --git a/phpmyfaq/admin/user.php b/phpmyfaq/admin/user.php
@@ -316,7 +316,7 @@
     }
 
     // show list of all users
-    if ($userAction == 'listallusers' && $permission$user->perm->checkRight($user->getUserId(), 'edituser')) {
+    if ($userAction == 'listallusers' && $user->perm->checkRight($user->getUserId(), 'edituser')) {
         $templateVars = array(
             'PMF_LANG'          => $PMF_LANG,
             'displayPagination' => false,

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$adminMenuBuilder = new AdminMenuBuilder($twig);`
`62`		`-$adminMenuBuilder->->setUser($user);`
	`62`	`+$adminMenuBuilder->setUser($user);`
`63`	`63`
`64`	`64`	`switch ($action) {`
`65`	`65`	`case 'user':`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`// show list of all users`
`319`		`- if ($userAction == 'listallusers' && $permission$user->perm->checkRight($user->getUserId(), 'edituser')) {`
	`319`	`+ if ($userAction == 'listallusers' && $user->perm->checkRight($user->getUserId(), 'edituser')) {`
`320`	`320`	`$templateVars = array(`
`321`	`321`	`'PMF_LANG' => $PMF_LANG,`
`322`	`322`	`'displayPagination' => false,`