From f40745f34c8afdc228e561d1906e1a208b0133b6 Mon Sep 17 00:00:00 2001 From: Geert De Deckere Date: Mon, 16 Jan 2012 07:37:50 +0100 Subject: [PATCH 1/2] Optimized get_base_country() and get_base_state() --- classes/countries.class.php | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/classes/countries.class.php b/classes/countries.class.php index 64390760204..2a5a5bbacab 100644 --- a/classes/countries.class.php +++ b/classes/countries.class.php @@ -408,35 +408,23 @@ class woocommerce_countries { ) ); } - + /** get base country */ function get_base_country() { $default = get_option('woocommerce_default_country'); - if (strstr($default, ':')) : - $country = current(explode(':', $default)); - $state = end(explode(':', $default)); - else : - $country = $default; - $state = ''; - endif; - - return $country; + if (($pos = strpos($default, ':')) === false) + return $default; + return substr($default, 0, $pos); } - + /** get base state */ function get_base_state() { $default = get_option('woocommerce_default_country'); - if (strstr($default, ':')) : - $country = current(explode(':', $default)); - $state = end(explode(':', $default)); - else : - $country = $default; - $state = ''; - endif; - - return $state; + if (($pos = strrpos($default, ':')) === false) + return ''; + return substr($default, $pos + 1); } - + /** get countries we allow only */ function get_allowed_countries() { From 69721c8276d833f72b22195c5edbf0b699d1f6b4 Mon Sep 17 00:00:00 2001 From: Geert De Deckere Date: Mon, 16 Jan 2012 07:40:13 +0100 Subject: [PATCH 2/2] Removed unneeded variable in countries class --- classes/countries.class.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/classes/countries.class.php b/classes/countries.class.php index 2a5a5bbacab..74a15093fe7 100644 --- a/classes/countries.class.php +++ b/classes/countries.class.php @@ -428,9 +428,7 @@ class woocommerce_countries { /** get countries we allow only */ function get_allowed_countries() { - $countries = $this->countries; - - if (get_option('woocommerce_allowed_countries')!=='specific') return $countries; + if (get_option('woocommerce_allowed_countries')!=='specific') return $this->countries; $allowed_countries = array(); @@ -438,7 +436,7 @@ class woocommerce_countries { foreach ($allowed_countries_raw as $country) : - $allowed_countries[$country] = $countries[$country]; + $allowed_countries[$country] = $this->countries[$country]; endforeach; @@ -502,9 +500,7 @@ class woocommerce_countries { /** Outputs the list of countries and states for use in dropdown boxes */ function country_dropdown_options( $selected_country = '', $selected_state = '', $escape=false ) { - $countries = $this->countries; - - if ( $countries ) foreach ( $countries as $key=>$value) : + if ( $this->countries ) foreach ( $this->countries as $key=>$value) : if ( $states = $this->get_states($key) ) : echo ''; foreach ($states as $state_key=>$state_value) : @@ -526,9 +522,7 @@ class woocommerce_countries { /** Outputs the list of countries and states for use in multiselect boxes */ function country_multiselect_options( $selected_countries = '', $escape=false ) { - $countries = $this->countries; - - if ( $countries ) foreach ( $countries as $key=>$value) : + if ( $this->countries ) foreach ( $this->countries as $key=>$value) : if ( $states = $this->get_states($key) ) : echo ''; foreach ($states as $state_key=>$state_value) :