| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** |
| 4 | - * Base class for both admin and frontend | |
| 4 | + * base class for both admin and frontend | |
| 5 | 5 | * |
| 6 | 6 | * @since 1.2 |
| 7 | 7 | */ |
| 8 | 8 | abstract class PLL_Base { |
| @@ -8,9 +8,9 @@ | ||
| 8 | 8 | abstract class PLL_Base { |
| 9 | 9 | public $links_model, $model, $options; |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | - * Constructor | |
| 12 | + * constructor | |
| 13 | 13 | * |
| 14 | 14 | * @since 1.2 |
| 15 | 15 | * |
| 16 | 16 | * @param object $links_model |
| @@ -19,96 +19,64 @@ | ||
| 19 | 19 | $this->links_model = &$links_model; |
| 20 | 20 | $this->model = &$links_model->model; |
| 21 | 21 | $this->options = &$this->model->options; |
| 22 | 22 | |
| 23 | - $GLOBALS['l10n_unloaded']['pll_string'] = true; // Short-circuit _load_textdomain_just_in_time() for 'pll_string' domain in WP 4.6+ | |
| 24 | - | |
| 25 | 23 | add_action( 'widgets_init', array( $this, 'widgets_init' ) ); |
| 26 | 24 | |
| 27 | - // User defined strings translations | |
| 25 | + // user defined strings translations | |
| 28 | 26 | add_action( 'pll_language_defined', array( $this, 'load_strings_translations' ), 5 ); |
| 29 | - add_action( 'change_locale', array( $this, 'load_strings_translations' ) ); // Since WP 4.7 | |
| 30 | 27 | |
| 31 | - // Switch_to_blog | |
| 28 | + // switch_to_blog | |
| 32 | 29 | add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 ); |
| 33 | 30 | } |
| 34 | 31 | |
| 35 | 32 | /** |
| 36 | - * Instantiate classes always needed | |
| 33 | + * registers our widgets | |
| 37 | 34 | * |
| 38 | - * @since 2.6 | |
| 39 | - */ | |
| 40 | - public function init() { | |
| 41 | - // REST API | |
| 42 | - if ( class_exists( 'PLL_REST_API' ) ) { | |
| 43 | - $this->rest_api = new PLL_REST_API( $this ); | |
| 44 | - } | |
| 45 | - | |
| 46 | - if ( $this->model->get_languages_list() ) { | |
| 47 | - // Used by content duplicate and post synchronization | |
| 48 | - if ( class_exists( 'PLL_Sync_Content' ) ) { | |
| 49 | - $this->sync_content = new PLL_Sync_Content( $this ); | |
| 50 | - } | |
| 51 | - | |
| 52 | - // Active languages | |
| 53 | - if ( class_exists( 'PLL_Active_Languages' ) ) { | |
| 54 | - $this->active_languages = new PLL_Active_Languages( $this ); | |
| 55 | - } | |
| 56 | - | |
| 57 | - // Share post slugs | |
| 58 | - if ( get_option( 'permalink_structure' ) && $this->options['force_lang'] && class_exists( 'PLL_Share_Post_Slug' ) ) { | |
| 59 | - $this->share_post_slug = new PLL_Share_Post_Slug( $this ); | |
| 60 | - } | |
| 61 | - } | |
| 62 | - } | |
| 63 | - | |
| 64 | - /** | |
| 65 | - * Registers our widgets | |
| 66 | - * | |
| 67 | 35 | * @since 0.1 |
| 68 | 36 | */ |
| 69 | 37 | public function widgets_init() { |
| 70 | 38 | register_widget( 'PLL_Widget_Languages' ); |
| 71 | 39 | |
| 72 | - // Overwrites the calendar widget to filter posts by language | |
| 40 | + // overwrites the calendar widget to filter posts by language | |
| 73 | 41 | if ( ! defined( 'PLL_WIDGET_CALENDAR' ) || PLL_WIDGET_CALENDAR ) { |
| 74 | 42 | unregister_widget( 'WP_Widget_Calendar' ); |
| 75 | 43 | register_widget( 'PLL_Widget_Calendar' ); |
| 76 | 44 | } |
| 45 | + | |
| 46 | + // backward compatibility with WP < 4.4 | |
| 47 | + // overwrites the recent posts and recent comments widget to use a language dependant cache key | |
| 48 | + // useful only if using a cache plugin | |
| 49 | + if ( version_compare( $GLOBALS['wp_version'], '4.4', '<' ) && defined( 'WP_CACHE' ) && WP_CACHE ) { | |
| 50 | + if ( ! defined( 'PLL_WIDGET_RECENT_POSTS' ) || PLL_WIDGET_RECENT_POSTS ) { | |
| 51 | + unregister_widget( 'WP_Widget_Recent_Posts' ); | |
| 52 | + register_widget( 'PLL_Widget_Recent_Posts' ); | |
| 53 | + } | |
| 54 | + | |
| 55 | + if ( ! defined( 'PLL_WIDGET_RECENT_COMMENTS' ) || PLL_WIDGET_RECENT_COMMENTS ) { | |
| 56 | + unregister_widget( 'WP_Widget_Recent_Comments' ); | |
| 57 | + register_widget( 'PLL_Widget_Recent_Comments' ); | |
| 58 | + } | |
| 59 | + } | |
| 77 | 60 | } |
| 78 | 61 | |
| 79 | 62 | /** |
| 80 | - * Loads user defined strings translations | |
| 63 | + * loads user defined strings translations | |
| 81 | 64 | * |
| 82 | 65 | * @since 1.2 |
| 83 | - * @since 2.1.3 $locale parameter added. | |
| 84 | - * | |
| 85 | - * @param string $locale Locale. Defaults to current locale. | |
| 86 | 66 | */ |
| 87 | - public function load_strings_translations( $locale = '' ) { | |
| 88 | - if ( empty( $locale ) ) { | |
| 89 | - $locale = get_locale(); | |
| 90 | - } | |
| 91 | - | |
| 92 | - $language = $this->model->get_language( $locale ); | |
| 93 | - | |
| 94 | - if ( ! empty( $language ) ) { | |
| 95 | - $mo = new PLL_MO(); | |
| 96 | - $mo->import_from_db( $language ); | |
| 97 | - $GLOBALS['l10n']['pll_string'] = &$mo; | |
| 98 | - } else { | |
| 99 | - unset( $GLOBALS['l10n']['pll_string'] ); | |
| 100 | - } | |
| 67 | + public function load_strings_translations() { | |
| 68 | + $mo = new PLL_MO(); | |
| 69 | + $mo->import_from_db( $this->model->get_language( get_locale() ) ); | |
| 70 | + $GLOBALS['l10n']['pll_string'] = &$mo; | |
| 101 | 71 | } |
| 102 | 72 | |
| 103 | 73 | /** |
| 104 | - * Resets some variables when switching blog | |
| 105 | - * Applies only if Polylang is active on the new blog | |
| 74 | + * resets some variables when switching blog | |
| 75 | + * applies only if Polylang is active on the new blog | |
| 106 | 76 | * |
| 107 | 77 | * @since 1.5.1 |
| 108 | 78 | * |
| 109 | - * @param int $new_blog | |
| 110 | - * @param int $old_blog | |
| 111 | 79 | * @return bool not used by WP but by child class |
| 112 | 80 | */ |
| 113 | 81 | public function switch_blog( $new_blog, $old_blog ) { |
| 114 | 82 | $plugins = ( $sitewide_plugins = get_site_option( 'active_sitewide_plugins' ) ) && is_array( $sitewide_plugins ) ? array_keys( $sitewide_plugins ) : array(); |
| @@ -116,10 +84,9 @@ | ||
| 116 | 84 | |
| 117 | 85 | // 2nd test needed when Polylang is not networked activated |
| 118 | 86 | // 3rd test needed when Polylang is networked activated and a new site is created |
| 119 | 87 | if ( $new_blog != $old_blog && in_array( POLYLANG_BASENAME, $plugins ) && get_option( 'polylang' ) ) { |
| 120 | - $this->options = get_option( 'polylang' ); // Needed for menus | |
| 121 | - remove_action( 'pre_option_rewrite_rules', array( $this->links_model, 'prepare_rewrite_rules' ) ); | |
| 88 | + $this->options = get_option( 'polylang' ); // needed for menus | |
| 122 | 89 | $this->links_model = $this->model->get_links_model(); |
| 123 | 90 | return true; |
| 124 | 91 | } |
| 125 | 92 | return false; |
| @@ -125,45 +92,32 @@ | ||
| 125 | 92 | return false; |
| 126 | 93 | } |
| 127 | 94 | |
| 128 | 95 | /** |
| 129 | - * Some backward compatibility with Polylang < 1.2 | |
| 130 | - * Allows for example to call $polylang->get_languages_list() instead of $polylang->model->get_languages_list() | |
| 131 | - * This works but should be slower than the direct call, thus an error is triggered in debug mode | |
| 96 | + * some backward compatibility with Polylang < 1.2 | |
| 97 | + * allows for example to call $polylang->get_languages_list() instead of $polylang->model->get_languages_list() | |
| 98 | + * this works but should be slower than the direct call, thus an error is triggered in debug mode | |
| 132 | 99 | * |
| 133 | 100 | * @since 1.2 |
| 134 | 101 | * |
| 135 | 102 | * @param string $func function name |
| 136 | - * @param array $args function arguments | |
| 103 | + * @param array $args function arguments | |
| 137 | 104 | */ |
| 138 | 105 | public function __call( $func, $args ) { |
| 139 | 106 | foreach ( $this as $prop => &$obj ) { |
| 140 | 107 | if ( is_object( $obj ) && method_exists( $obj, $func ) ) { |
| 141 | 108 | if ( WP_DEBUG ) { |
| 142 | - $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 143 | - $i = 1 + empty( $debug[1]['line'] ); // The file and line are in $debug[2] if the function was called using call_user_func | |
| 144 | - trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 145 | - sprintf( | |
| 146 | - '%1$s was called incorrectly in %3$s on line %4$s: the call to $polylang->%1$s() has been deprecated in Polylang 1.2, use PLL()->%2$s->%1$s() instead.' . "\nError handler", | |
| 147 | - esc_html( $func ), | |
| 148 | - esc_html( $prop ), | |
| 149 | - esc_html( $debug[ $i ]['file'] ), | |
| 150 | - absint( $debug[ $i ]['line'] ) | |
| 151 | - ) | |
| 152 | - ); | |
| 109 | + $debug = debug_backtrace(); | |
| 110 | + $i = 1 + empty( $debug[1]['line'] ); // the file and line are in $debug[2] if the function was called using call_user_func | |
| 111 | + trigger_error( sprintf( | |
| 112 | + '%1$s was called incorrectly in %3$s on line %4$s: the call to $polylang->%1$s() has been deprecated in Polylang 1.2, use PLL()->%2$s->%1$s() instead.' . "\nError handler", | |
| 113 | + $func, $prop, $debug[ $i ]['file'], $debug[ $i ]['line'] | |
| 114 | + ) ); | |
| 153 | 115 | } |
| 154 | 116 | return call_user_func_array( array( $obj, $func ), $args ); |
| 155 | 117 | } |
| 156 | 118 | } |
| 157 | 119 | |
| 158 | - $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 159 | - trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 160 | - sprintf( | |
| 161 | - 'Call to undefined function PLL()->%1$s() in %2$s on line %3$s' . "\nError handler", | |
| 162 | - esc_html( $func ), | |
| 163 | - esc_html( $debug[0]['file'] ), | |
| 164 | - absint( $debug[0]['line'] ) | |
| 165 | - ), | |
| 166 | - E_USER_ERROR | |
| 167 | - ); | |
| 120 | + $debug = debug_backtrace(); | |
| 121 | + trigger_error( sprintf( 'Call to undefined function PLL()->%1$s() in %2$s on line %3$s' . "\nError handler", $func, $debug[0]['file'], $debug[0]['line'] ), E_USER_ERROR ); | |
| 168 | 122 | } |
| 169 | 123 | } |
