| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | <?php if (! defined('ABSPATH')) exit; // Exit if accessed directly |
| 2 | 2 | class HC3_Settings implements HC3_ISettings |
| 3 | 3 | { |
| 4 | - protected $prefix = ''; | |
| 4 | + protected $prefix = NULL; | |
| 5 | 5 | |
| 6 | 6 | protected $defaults = array(); |
| 7 | 7 | protected $loaded = array(); |
| 8 | 8 | |
| @@ -41,66 +41,30 @@ | ||
| 41 | 41 | unset( $this->loaded[$name] ); |
| 42 | 42 | return $this; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function get( $name, $wantArray = false ) | |
| 45 | + public function get( $name, $wantArray = FALSE ) | |
| 46 | 46 | { |
| 47 | - static $repo = null; | |
| 48 | - if( null === $repo ){ | |
| 49 | - $repo = wp_load_alloptions(); | |
| 50 | - } | |
| 47 | + $return = NULL; | |
| 51 | 48 | |
| 52 | - $ret = null; | |
| 53 | - | |
| 54 | 49 | if( array_key_exists($name, $this->loaded) ){ |
| 55 | - $ret = $this->loaded[ $name ]; | |
| 50 | + $return = $this->loaded[$name]; | |
| 56 | 51 | } |
| 57 | 52 | else { |
| 58 | - $default = array_key_exists( $name, $this->defaults ) ? $this->defaults[$name] : null; | |
| 59 | - | |
| 60 | - $prefixedName = $this->prefix . $name; | |
| 61 | - $ret = array_key_exists( $prefixedName, $repo ) ? $repo[ $prefixedName ] : $default; | |
| 62 | - $ret = maybe_unserialize( $ret ); | |
| 63 | - | |
| 64 | - if( null !== $ret ){ | |
| 65 | - $this->loaded[ $name ] = $ret; | |
| 66 | - } | |
| 67 | - } | |
| 68 | - | |
| 69 | - if( $wantArray && (! is_array($ret)) ){ | |
| 70 | - $ret = ( null === $ret ) ? array() : array($ret); | |
| 71 | - } | |
| 72 | - | |
| 73 | - if( (! $wantArray) && is_array($ret) ){ | |
| 74 | - $ret = array_shift( $ret ); | |
| 75 | - } | |
| 76 | - | |
| 77 | - return $ret; | |
| 78 | - } | |
| 79 | - | |
| 80 | - public function get_( $name, $wantArray = false ) | |
| 81 | - { | |
| 82 | - $ret = null; | |
| 83 | - | |
| 84 | - if( array_key_exists($name, $this->loaded) ){ | |
| 85 | - $ret = $this->loaded[$name]; | |
| 86 | - } | |
| 87 | - else { | |
| 88 | 53 | $default = array_key_exists($name, $this->defaults) ? $this->defaults[$name] : NULL; |
| 89 | - $ret = get_option( $this->prefix . $name, $default ); | |
| 90 | - | |
| 91 | - if( NULL !== $ret ){ | |
| 92 | - $this->loaded[$name] = $ret; | |
| 54 | + $return = get_option( $this->prefix . $name, $default ); | |
| 55 | + if( NULL !== $return ){ | |
| 56 | + $this->loaded[$name] = $return; | |
| 93 | 57 | } |
| 94 | 58 | } |
| 95 | 59 | |
| 96 | - if( $wantArray && (! is_array($ret)) ){ | |
| 97 | - $ret = ( null === $ret ) ? array() : array($ret); | |
| 60 | + if( $wantArray && (! is_array($return)) ){ | |
| 61 | + $return = ( NULL === $return ) ? array() : array($return); | |
| 98 | 62 | } |
| 99 | 63 | |
| 100 | - if( (! $wantArray) && is_array($ret) ){ | |
| 101 | - $ret = array_shift( $ret ); | |
| 64 | + if( (! $wantArray) && is_array($return) ){ | |
| 65 | + $return = array_shift( $return ); | |
| 102 | 66 | } |
| 103 | 67 | |
| 104 | - return $ret; | |
| 68 | + return $return; | |
| 105 | 69 | } |
| 106 | 70 | } |
