David A. Windham
david
/
laravel
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

tweaked config and lang classes.

Taylor Otwell 13 years ago
parent
f087df9bb8
commit
3583bc3b09
3 changed files with 13 additions and 13 deletions
Split View Show Diff Stats
  1. 0 10
      application/views/home/index.php
  2. 6 1
      system/config.php
  3. 7 2
      system/lang.php

+ 0 - 10
application/views/home/index.php
View File 

@@ -61,12 +61,6 @@
 
 		.wrapper h2:first-of-type {
 
 			margin-top: 0;
 
 		}
 
-
 
-		.footer {
 
-			background-color: #eee;
 
-			font-size: 12px;
 
-			text-align: right;
 
-		}
 
 	</style>
 
 </head> 
 <body>
 
@@ -81,9 +75,5 @@
 
 
 		<p>Need to learn more? Peruse our <a href="http://laravel.com">wonderful documentation</a>.</p>
 
 	</div>
 
-
 
-	<div class="wrapper footer">
 
-		<?php echo Benchmark::check('laravel').'ms | '.Benchmark::memory().'mb'; ?>
 
-	</div>
 
 </body> 
 </html>

+ 6 - 1
system/config.php
View File 

@@ -110,7 +110,12 @@ class Config {
 
 			$config = array_merge($config, require $path);
 
 		}
 
 
-		return (count(static::$items[$file] = $config) > 0);
 
+		if (count($config) > 0)
 
+		{
 
+			static::$items[$file] = $config;
 
+		}
 
+
 
+		return isset(static::$items[$file]);
 
 	}
 
 
 }

+ 7 - 2
system/lang.php
View File 

@@ -61,7 +61,7 @@ class Lang {
 
 	 * @param  mixed   $default
 
 	 * @return string
 
 	 */
 
-	public function get($language = null, $default = '')
 
+	public function get($language = null, $default = null)
 
 	{
 
 		if (is_null($language))
 
 		{
 
@@ -72,7 +72,12 @@ class Lang {
 
 
 		$this->load($file, $language);
 
 
-		$line = Arr::get(static::$lines[$language.$file], $line, $default);
 
+		if ( ! isset(static::$lines[$language.$file][$line]))
 
+		{
 
+			return is_callable($default) ? call_user_func($default) : $default;
 
+		}
 
+
 
+		$line = static::$lines[$language.$file][$line];
 
 
 		foreach ($this->replacements as $key => $value)
 
 		{