projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0049908
)
CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest
author
Tim Otten
<totten@civicrm.org>
Wed, 23 Jul 2014 06:53:54 +0000
(23:53 -0700)
committer
Tim Otten
<totten@civicrm.org>
Wed, 23 Jul 2014 06:53:54 +0000
(23:53 -0700)
Follow-up to
29f6fbb7c
CRM/Core/Permission/WordPress.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Permission/WordPress.php
b/CRM/Core/Permission/WordPress.php
index dac689daaf037043e6ef8224dc2598aba18f91b8..fbe9dbf7f6203bdeb554cd82ab37e3a1f489e22e 100644
(file)
--- a/
CRM/Core/Permission/WordPress.php
+++ b/
CRM/Core/Permission/WordPress.php
@@
-46,7
+46,6
@@
class CRM_Core_Permission_WordPress extends CRM_Core_Permission_Base {
* @access public
*/
function check($str) {
- require_once ABSPATH . WPINC . '/pluggable.php';
// Generic cms 'administer users' role tranlates to 'administrator' WordPress role
$str = $this->translatePermission($str, 'WordPress', array(
'administer users' => 'administrator',
@@
-58,6
+57,8
@@
class CRM_Core_Permission_WordPress extends CRM_Core_Permission_Base {
return TRUE;
}
+ require_once ABSPATH . WPINC . '/pluggable.php';
+
// for administrators give them all permissions
if (!function_exists('current_user_can')) {
return TRUE;