Merge pull request #1 from crlcu/master

Setting::get($key, $default)
juy · Jul 19, 2014 · b8ca0a6 · b8ca0a6
2 parents c923174 + 86b4b55
commit b8ca0a6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Juy/Setting/Setting.php b/src/Juy/Setting/Setting.php
@@ -16,10 +16,11 @@ class Setting {
 	 * Get setting key to value
 	 *
 	 * @param $key
+	 * @param $default
 	 *
 	 * @return null
 	 */
-	public function get($key)
+	public function get($key, $default = null)
 	{
 		try
 		{
@@ -38,7 +39,7 @@ public function get($key)
 				return $arr;
 			});
 
-			return (isset($settings[$key])) ? $settings[$key] : null;
+			return (isset($settings[$key])) ? $settings[$key] : ( ($default) ? $default : null );
 		}
 		catch(\Exception $e)
 		{