adjusted method order in request class.

taylorotwell · taylorotwell · commit 0b7dbab0aff1 · 2011-06-25T20:20:09.000-05:00
diff --git a/system/request.php b/system/request.php
@@ -110,23 +110,23 @@ public static function ip()
 	}
 
 	/**
-	 * Determine if the request is using HTTPS.
+	 * Get the HTTP protocol for the request.
 	 *
-	 * @return bool
+	 * @return string
 	 */
-	public static function is_secure()
+	public static function protocol()
 	{
-		return (static::protocol() == 'https');
+		return (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
 	}
 
 	/**
-	 * Get the HTTP protocol for the request.
+	 * Determine if the request is using HTTPS.
 	 *
-	 * @return string
+	 * @return bool
 	 */
-	public static function protocol()
+	public static function is_secure()
 	{
-		return (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+		return (static::protocol() == 'https');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -110,23 +110,23 @@ public static function ip()`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
`113`		`- * Determine if the request is using HTTPS.`
	`113`	`+ * Get the HTTP protocol for the request.`
`114`	`114`	`*`
`115`		`- * @return bool`
	`115`	`+ * @return string`
`116`	`116`	`*/`
`117`		`- public static function is_secure()`
	`117`	`+ public static function protocol()`
`118`	`118`	`{`
`119`		`- return (static::protocol() == 'https');`
	`119`	`+ return (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/**`
`123`		`- * Get the HTTP protocol for the request.`
	`123`	`+ * Determine if the request is using HTTPS.`
`124`	`124`	`*`
`125`		`- * @return string`
	`125`	`+ * @return bool`
`126`	`126`	`*/`
`127`		`- public static function protocol()`
	`127`	`+ public static function is_secure()`
`128`	`128`	`{`
`129`		`- return (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';`
	`129`	`+ return (static::protocol() == 'https');`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/**`