Skip to content

Commit

Permalink
Moved config loading to plugins_loaded filter on admin side.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnclause committed Sep 26, 2015
1 parent 2845781 commit b3cb8ca
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
23 changes: 14 additions & 9 deletions admin/qtx_admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,20 @@ function qtranxf_collect_translations_posted() {
}
add_action('plugins_loaded', 'qtranxf_collect_translations_posted', 5);

function qtranxf_admin_load()
{
//qtranxf_dbg_log('qtranxf_admin_load:');
qtranxf_admin_loadConfig();
$page_configs = qtranxf_get_admin_page_config();
if(!empty($page_configs['']['filters'])){
qtranxf_add_filters($page_configs['']['filters']);
}
qtranxf_add_admin_filters();
}
qtranxf_admin_load();

function qtranxf_admin_init(){
global $q_config, $pagenow;
//qtranxf_dbg_log('"admin_init": qtranxf_admin_init: REQUEST_TIME_FLOAT: ', $_SERVER['REQUEST_TIME_FLOAT']);
qtranxf_admin_loadConfig();

add_action('admin_notices', 'qtranxf_admin_notices_config');

Expand Down Expand Up @@ -160,14 +170,9 @@ function qtranxf_admin_init(){
qtranxf_updateTermLibraryJoin();
//qtranxf_updateSlug();
}

$page_configs = qtranxf_get_admin_page_config();
if(!empty($page_configs['']['filters'])){
qtranxf_add_filters($page_configs['']['filters']);
}
}
//add_action('qtranslate_init_begin','qtranxf_admin_init');
add_action('admin_init','qtranxf_admin_init');
add_action('admin_init','qtranxf_admin_init',2);

/**
* load field configurations for the current admin page
Expand Down Expand Up @@ -778,7 +783,7 @@ function qtranxf_add_admin_filters()
add_filter('home_url', 'qtranxf_admin_home_url', 5, 4);
}
}
qtranxf_add_admin_filters();
//qtranxf_add_admin_filters();

add_action('admin_head-nav-menus.php', 'qtranxf_add_nav_menu_metabox');
add_action('admin_menu', 'qtranxf_admin_menu', 999);
Expand Down
2 changes: 1 addition & 1 deletion admin/qtx_admin_utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ function qtranxf_meta_box_LSB()
function qtranxf_add_meta_box_LSB($post_type, $post)
{
global $q_config, $pagenow;
if( $q_config['editor_mode'] == QTX_EDITOR_MODE_RAW) return;
if( $q_config['editor_mode'] != QTX_EDITOR_MODE_LSB) return;
switch($pagenow){
case 'post-new.php':
case 'post.php': break;
Expand Down
4 changes: 2 additions & 2 deletions qtranslate.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: qTranslate-X
Plugin URI: http://wordpress.org/plugins/qtranslate-x/
Description: Adds user-friendly and database-friendly multilingual content support.
Version: 3.4.5.1
Version: 3.4.5.2
Author: qTranslate Team
Author URI: http://qtranslatexteam.wordpress.com/about
Tags: multilingual, multi, language, admin, tinymce, Polyglot, bilingual, widget, switcher, professional, human, translation, service, qTranslate, zTranslate, mqTranslate, qTranslate Plus, WPML
Expand Down Expand Up @@ -118,7 +118,7 @@
* Designed as interface for other plugin integration. The documentation is available at
* https://qtranslatexteam.wordpress.com/integration/
*/
define('QTX_VERSION','3.4.5.1');
define('QTX_VERSION','3.4.5.2');

if ( ! defined( 'QTRANSLATE_FILE' ) ) {
define( 'QTRANSLATE_FILE', __FILE__ );
Expand Down
2 changes: 1 addition & 1 deletion qtranslate_core.php
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ function qtranxf_load_option_qtrans_compatibility(){
function qtranxf_init() {
//qtranxf_dbg_log('"init": qtranxf_init: REQUEST_TIME_FLOAT: ', $_SERVER['REQUEST_TIME_FLOAT']);
}
add_action('init', 'qtranxf_init');//user is authenticated
add_action('init', 'qtranxf_init',2);//user is authenticated

/* //use action 'init' in front-end and/or action 'admin_init' admin-end accordingly
* Response to action 'init', which runs after user is authenticated
Expand Down
4 changes: 4 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ Read [migration instructions](https://qtranslatexteam.wordpress.com/migration/ "

## Changelog ##

### 3.4.5.2 ###
* Improvement: admin configuration loading is moved to filter 'plugins_loaded', search for function `qtranxf_admin_load` to see the change.
* Fix: removed meta box "Languages" in any Editor Mode, except "Single Language".

### 3.4.5.1 ###
* Enhancement: argument `$found` for `qtranxf_split_blocks`.
* Enhancement: removed limit of 5 characters in language form for locale: [Issue #262](https://github.com/qTranslate-Team/qtranslate-x/issues/262);
Expand Down

0 comments on commit b3cb8ca

Please sign in to comment.