| @@ -1,53 +1,17 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | -/** | |
| 7 | - * Base class for both admin and frontend | |
| 3 | +/* | |
| 4 | + * base class for both admin and frontend | |
| 8 | 5 | * |
| 9 | 6 | * @since 1.2 |
| 10 | 7 | */ |
| 11 | 8 | abstract class PLL_Base { |
| 12 | - /** | |
| 13 | - * Stores the plugin options. | |
| 14 | - * | |
| 15 | - * @var array | |
| 16 | - */ | |
| 17 | - public $options; | |
| 9 | + public $links_model, $model, $options; | |
| 18 | 10 | |
| 19 | - /** | |
| 20 | - * Instance of PLL_Model. | |
| 11 | + /* | |
| 12 | + * constructor | |
| 21 | 13 | * |
| 22 | - * @var PLL_Model | |
| 23 | - */ | |
| 24 | - public $model; | |
| 25 | - | |
| 26 | - /** | |
| 27 | - * Instance of a child class of PLL_Links_Model. | |
| 28 | - * | |
| 29 | - * @var PLL_Links_Model | |
| 30 | - */ | |
| 31 | - public $links_model; | |
| 32 | - | |
| 33 | - /** | |
| 34 | - * Registers hooks on insert / update post related actions and filters. | |
| 35 | - * | |
| 36 | - * @var PLL_CRUD_Posts | |
| 37 | - */ | |
| 38 | - public $posts; | |
| 39 | - | |
| 40 | - /** | |
| 41 | - * Registers hooks on insert / update term related action and filters. | |
| 42 | - * | |
| 43 | - * @var PLL_CRUD_Terms | |
| 44 | - */ | |
| 45 | - public $terms; | |
| 46 | - | |
| 47 | - /** | |
| 48 | - * Constructor | |
| 49 | - * | |
| 50 | 14 | * @since 1.2 |
| 51 | 15 | * |
| 52 | 16 | * @param object $links_model |
| 53 | 17 | */ |
| @@ -55,86 +19,64 @@ | ||
| 55 | 19 | $this->links_model = &$links_model; |
| 56 | 20 | $this->model = &$links_model->model; |
| 57 | 21 | $this->options = &$this->model->options; |
| 58 | 22 | |
| 59 | - $GLOBALS['l10n_unloaded']['pll_string'] = true; // Short-circuit _load_textdomain_just_in_time() for 'pll_string' domain in WP 4.6+ | |
| 23 | + add_action( 'widgets_init', array( &$this, 'widgets_init' ) ); | |
| 60 | 24 | |
| 61 | - add_action( 'widgets_init', array( $this, 'widgets_init' ) ); | |
| 25 | + // user defined strings translations | |
| 26 | + add_action( 'pll_language_defined', array( &$this, 'load_strings_translations' ), 5 ); | |
| 62 | 27 | |
| 63 | - // User defined strings translations | |
| 64 | - add_action( 'pll_language_defined', array( $this, 'load_strings_translations' ), 5 ); | |
| 65 | - add_action( 'change_locale', array( $this, 'load_strings_translations' ) ); // Since WP 4.7 | |
| 66 | - | |
| 67 | - // Switch_to_blog | |
| 68 | - add_action( 'switch_blog', array( $this, 'switch_blog' ), 10, 2 ); | |
| 28 | + // switch_to_blog | |
| 29 | + add_action( 'switch_blog', array( &$this, 'switch_blog' ), 10, 2 ); | |
| 69 | 30 | } |
| 70 | 31 | |
| 71 | - /** | |
| 72 | - * Instantiates classes reacting to CRUD operations on posts and terms, | |
| 73 | - * only when at least one language is defined. | |
| 32 | + /* | |
| 33 | + * registers our widgets | |
| 74 | 34 | * |
| 75 | - * @since 2.6 | |
| 76 | - */ | |
| 77 | - public function init() { | |
| 78 | - if ( $this->model->get_languages_list() ) { | |
| 79 | - $this->posts = new PLL_CRUD_Posts( $this ); | |
| 80 | - $this->terms = new PLL_CRUD_Terms( $this ); | |
| 81 | - | |
| 82 | - // WordPress options. | |
| 83 | - new PLL_Translate_Option( 'blogname', array(), array( 'context' => 'WorPress' ) ); | |
| 84 | - new PLL_Translate_Option( 'blogdescription', array(), array( 'context' => 'WorPress' ) ); | |
| 85 | - new PLL_Translate_Option( 'date_format', array(), array( 'context' => 'WorPress' ) ); | |
| 86 | - new PLL_Translate_Option( 'time_format', array(), array( 'context' => 'WorPress' ) ); | |
| 87 | - } | |
| 88 | - } | |
| 89 | - | |
| 90 | - /** | |
| 91 | - * Registers our widgets | |
| 92 | - * | |
| 93 | 35 | * @since 0.1 |
| 94 | 36 | */ |
| 95 | 37 | public function widgets_init() { |
| 96 | 38 | register_widget( 'PLL_Widget_Languages' ); |
| 97 | 39 | |
| 98 | - // Overwrites the calendar widget to filter posts by language | |
| 40 | + // overwrites the calendar widget to filter posts by language | |
| 99 | 41 | if ( ! defined( 'PLL_WIDGET_CALENDAR' ) || PLL_WIDGET_CALENDAR ) { |
| 100 | 42 | unregister_widget( 'WP_Widget_Calendar' ); |
| 101 | 43 | register_widget( 'PLL_Widget_Calendar' ); |
| 102 | 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 | + } | |
| 103 | 60 | } |
| 104 | 61 | |
| 105 | - /** | |
| 106 | - * Loads user defined strings translations | |
| 62 | + /* | |
| 63 | + * loads user defined strings translations | |
| 107 | 64 | * |
| 108 | 65 | * @since 1.2 |
| 109 | - * @since 2.1.3 $locale parameter added. | |
| 110 | - * | |
| 111 | - * @param string $locale Locale. Defaults to current locale. | |
| 112 | 66 | */ |
| 113 | - public function load_strings_translations( $locale = '' ) { | |
| 114 | - if ( empty( $locale ) ) { | |
| 115 | - $locale = get_locale(); | |
| 116 | - } | |
| 117 | - | |
| 118 | - $language = $this->model->get_language( $locale ); | |
| 119 | - | |
| 120 | - if ( ! empty( $language ) ) { | |
| 121 | - $mo = new PLL_MO(); | |
| 122 | - $mo->import_from_db( $language ); | |
| 123 | - $GLOBALS['l10n']['pll_string'] = &$mo; | |
| 124 | - } else { | |
| 125 | - unset( $GLOBALS['l10n']['pll_string'] ); | |
| 126 | - } | |
| 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; | |
| 127 | 71 | } |
| 128 | 72 | |
| 129 | - /** | |
| 130 | - * Resets some variables when switching blog | |
| 131 | - * Applies only if Polylang is active on the new blog | |
| 73 | + /* | |
| 74 | + * resets some variables when switching blog | |
| 75 | + * applies only if Polylang is active on the new blog | |
| 132 | 76 | * |
| 133 | 77 | * @since 1.5.1 |
| 134 | 78 | * |
| 135 | - * @param int $new_blog | |
| 136 | - * @param int $old_blog | |
| 137 | 79 | * @return bool not used by WP but by child class |
| 138 | 80 | */ |
| 139 | 81 | public function switch_blog( $new_blog, $old_blog ) { |
| 140 | 82 | $plugins = ( $sitewide_plugins = get_site_option( 'active_sitewide_plugins' ) ) && is_array( $sitewide_plugins ) ? array_keys( $sitewide_plugins ) : array(); |
| @@ -142,10 +84,9 @@ | ||
| 142 | 84 | |
| 143 | 85 | // 2nd test needed when Polylang is not networked activated |
| 144 | 86 | // 3rd test needed when Polylang is networked activated and a new site is created |
| 145 | 87 | if ( $new_blog != $old_blog && in_array( POLYLANG_BASENAME, $plugins ) && get_option( 'polylang' ) ) { |
| 146 | - $this->options = get_option( 'polylang' ); // Needed for menus | |
| 147 | - remove_action( 'pre_option_rewrite_rules', array( $this->links_model, 'prepare_rewrite_rules' ) ); | |
| 88 | + $this->options = get_option( 'polylang' ); // needed for menus | |
| 148 | 89 | $this->links_model = $this->model->get_links_model(); |
| 149 | 90 | return true; |
| 150 | 91 | } |
| 151 | 92 | return false; |
| @@ -150,46 +91,33 @@ | ||
| 150 | 91 | } |
| 151 | 92 | return false; |
| 152 | 93 | } |
| 153 | 94 | |
| 154 | - /** | |
| 155 | - * Some backward compatibility with Polylang < 1.2 | |
| 156 | - * Allows for example to call $polylang->get_languages_list() instead of $polylang->model->get_languages_list() | |
| 157 | - * This works but should be slower than the direct call, thus an error is triggered in debug mode | |
| 95 | + /* | |
| 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 | |
| 158 | 99 | * |
| 159 | 100 | * @since 1.2 |
| 160 | 101 | * |
| 161 | 102 | * @param string $func function name |
| 162 | - * @param array $args function arguments | |
| 103 | + * @param array $args function arguments | |
| 163 | 104 | */ |
| 164 | 105 | public function __call( $func, $args ) { |
| 165 | 106 | foreach ( $this as $prop => &$obj ) { |
| 166 | 107 | if ( is_object( $obj ) && method_exists( $obj, $func ) ) { |
| 167 | 108 | if ( WP_DEBUG ) { |
| 168 | - $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 169 | - $i = 1 + empty( $debug[1]['line'] ); // The file and line are in $debug[2] if the function was called using call_user_func | |
| 170 | - trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 171 | - sprintf( | |
| 172 | - '%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", | |
| 173 | - esc_html( $func ), | |
| 174 | - esc_html( $prop ), | |
| 175 | - esc_html( $debug[ $i ]['file'] ), | |
| 176 | - absint( $debug[ $i ]['line'] ) | |
| 177 | - ) | |
| 178 | - ); | |
| 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 | + ) ); | |
| 179 | 115 | } |
| 180 | 116 | return call_user_func_array( array( $obj, $func ), $args ); |
| 181 | 117 | } |
| 182 | 118 | } |
| 183 | 119 | |
| 184 | - $debug = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 185 | - trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions | |
| 186 | - sprintf( | |
| 187 | - 'Call to undefined function PLL()->%1$s() in %2$s on line %3$s' . "\nError handler", | |
| 188 | - esc_html( $func ), | |
| 189 | - esc_html( $debug[0]['file'] ), | |
| 190 | - absint( $debug[0]['line'] ) | |
| 191 | - ), | |
| 192 | - E_USER_ERROR | |
| 193 | - ); | |
| 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 ); | |
| 194 | 122 | } |
| 195 | 123 | } |
