Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

This commit is contained in:
Ramon van Belzen 2012-03-02 12:21:02 +01:00
parent 926f5e602b 01adf6a422
commit ecd34196c3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
woocommerce.php
View File

@ -989,11 +989,7 @@ class Woocommerce {
function plugin_url() {
if($this->plugin_url) return $this->plugin_url;
if (is_ssl()) :
return $this->plugin_url = str_replace('http://', 'https://', WP_PLUGIN_URL) . "/" . plugin_basename( dirname(__FILE__));
else :
return $this->plugin_url = WP_PLUGIN_URL . "/" . plugin_basename( dirname(__FILE__));
endif;
return $this->plugin_url = plugins_url( basename( plugin_dir_path(__FILE__) ), __THIS__ );
}
/**