Merge remote-tracking branch 'refs/remotes/origin/master' into language-packs

This commit is contained in:
Yahnis Elsts 2016-05-05 16:06:11 +03:00
commit a9ce2de7cf
3 changed files with 8 additions and 8 deletions

View File

@ -1,12 +1,12 @@
<?php
if ( !class_exists('PluginUpdateCheckerPanel', false) && class_exists('Debug_Bar_Panel', false) ) {
if ( !class_exists('PluginUpdateCheckerPanel_3_0', false) && class_exists('Debug_Bar_Panel', false) ) {
/**
* A Debug Bar panel for the plugin update checker.
*/
class PluginUpdateCheckerPanel extends Debug_Bar_Panel {
/** @var PluginUpdateChecker */
class PluginUpdateCheckerPanel_3_0 extends Debug_Bar_Panel {
/** @var PluginUpdateChecker_3_0 */
private $updateChecker;
private $responseBox = '<div class="puc-ajax-response" style="display: none;"></div>';

View File

@ -1,7 +1,7 @@
<?php
if ( !class_exists('PucDebugBarPlugin', false) ) {
if ( !class_exists('PucDebugBarPlugin_3_0', false) ) {
class PucDebugBarPlugin {
class PucDebugBarPlugin_3_0 {
/** @var PluginUpdateChecker_3_0 */
private $updateChecker;
@ -23,8 +23,8 @@ class PucDebugBarPlugin {
*/
public function addDebugBarPanel($panels) {
require_once dirname(__FILE__) . '/debug-bar-panel.php';
if ( current_user_can('update_plugins') && class_exists('PluginUpdateCheckerPanel', false) ) {
$panels[] = new PluginUpdateCheckerPanel($this->updateChecker);
if ( current_user_can('update_plugins') && class_exists('PluginUpdateCheckerPanel_3_0', false) ) {
$panels[] = new PluginUpdateCheckerPanel_3_0($this->updateChecker);
}
return $panels;
}

View File

@ -932,7 +932,7 @@ class PluginUpdateChecker_3_0 {
if ( class_exists('Debug_Bar', false) && file_exists($debugBarPlugin) ) {
/** @noinspection PhpIncludeInspection */
require_once $debugBarPlugin;
$this->debugBarPlugin = new PucDebugBarPlugin($this);
$this->debugBarPlugin = new PucDebugBarPlugin_3_0($this);
}
}