Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: 0118f8c008
...
compare: 439f246542
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Feb 01, 2012
David Farnan removed copypasta 5acf7f3
Commits on Mar 13, 2012
@ryross Merge pull request #3 from deeceefar2/master
Requested pull request
439f246
Showing with 8 additions and 4 deletions.
  1. +8 −4 classes/geoip3.php
View
12 classes/geoip3.php
@@ -19,8 +19,7 @@ class Geoip3 {
* Singleton instance
*
* @chainable
- * @param string $service The geocoding web service class name ('Google', 'Yahoo')
- * @param string $key The API key for the web service being used
+ * @param string $config
* @return object
*/
public static function instance($config = NULL)
@@ -46,8 +45,7 @@ public static function instance($config = NULL)
* Singleton factory
*
* @chainable
- * @param string $service The geocoding web service class name ('Google', 'Yahoo')
- * @param string $key The API key for the web service being used
+ * @param string $config
* @return object
*/
public static function factory($config = NULL)
@@ -62,6 +60,12 @@ public static function factory($config = NULL)
return new Geoip3($config);
}
+
+ /**
+ * Constructor
+ *
+ * @param string $config
+ */
public function __construct($config = NULL)
{
$this->_config = ($config === NULL) ? Kohana::$config->load('geoip3') : $config;

No commit comments for this range

Something went wrong with that request. Please try again.