Skip to content

Commit

Permalink
Merge pull request #129 from RRZE-Webteam/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
rvdforst authored Nov 8, 2022
2 parents 6729d5f + 881ac63 commit bd44af2
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 4,027 deletions.
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
### vscode ###
.vscode/
### NetBeans ###
**/nbproject/
### PhpStorm ###
.idea/
### macOS ###
.DS_Store
### Node ###
node_modules/
package-lock.json
### Composer ###
composer.lock
### WordPress ###
*.pot
### Tmp ###
_tmp/
5 changes: 3 additions & 2 deletions cms-workflow.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin Name: CMS-Workflow
Plugin URI: https://github.com/RRZE-Webteam/cms-workflow
Description: Redaktioneller Workflow.
Version: 1.17.3
Version: 1.18.0
Author: RRZE Webteam
Author URI: https://blogs.fau.de/webworking/
License: GNU General Public License v2
Expand Down Expand Up @@ -114,6 +114,7 @@ private function init() {

load_plugin_textdomain(CMS_WORKFLOW_TEXTDOMAIN, false, sprintf('%s/languages/', dirname(plugin_basename(__FILE__))));
include_once ABSPATH . 'wp-admin/includes/plugin.php';
// If rrze-multilang plugin is active unregister network & translation modules.
if (
is_plugin_active('rrze-multilang/rrze-multilang.php')
|| is_plugin_active_for_network('rrze-multilang/rrze-multilang.php')
Expand All @@ -122,7 +123,7 @@ private function init() {
return array_merge(['network', 'translation'], $modules);
});
}

$this->modules = new stdClass();

$this->set_modules();
Expand Down
Loading

0 comments on commit bd44af2

Please sign in to comment.