diff --git a/application/config/strings.php b/application/config/strings.php index 730f973e..5d94f81c 100644 --- a/application/config/strings.php +++ b/application/config/strings.php @@ -95,6 +95,7 @@ return array( 'series', 'sheep', 'species', + 'moose', ), /* diff --git a/laravel/cache/drivers/driver.php b/laravel/cache/drivers/driver.php index b4701eb8..c6abcb2e 100644 --- a/laravel/cache/drivers/driver.php +++ b/laravel/cache/drivers/driver.php @@ -1,4 +1,4 @@ -pdo->beginTransaction(); - // After beginning the database transaction, we will call the Closure + // After beginning the database transaction, we will call the callback // so that it can do its database work. If an exception occurs we'll // rollback the transaction and re-throw back to the developer. try diff --git a/laravel/database/eloquent/query.php b/laravel/database/eloquent/query.php index 71494a94..3aee79c9 100644 --- a/laravel/database/eloquent/query.php +++ b/laravel/database/eloquent/query.php @@ -129,9 +129,9 @@ class Query { { foreach ($this->model_includes() as $relationship => $constraints) { - // If the relationship is nested, we will skip laoding it here and let + // If the relationship is nested, we will skip loading it here and let // the load method parse and set the nested eager loads on the right - // relationship when it is getting ready to eager laod. + // relationship when it is getting ready to eager load. if (str_contains($relationship, '.')) { continue; diff --git a/laravel/database/query.php b/laravel/database/query.php index 29370931..607a8627 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -414,7 +414,10 @@ class Query { // Once the callback has been run on the query, we will store the nested // query instance on the where clause array so that it's passed to the // query's query grammar instance when building. - $this->wheres[] = compact('type', 'query', 'connector'); + if ($query->wheres !== null) + { + $this->wheres[] = compact('type', 'query', 'connector'); + } $this->bindings = array_merge($this->bindings, $query->bindings); diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index f74f7801..ae90e185 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -35,6 +35,7 @@ - [Added `unless` structure to Blade template engine](/docs/views/templating#blade-unless). - [Added Blade comments](/docs/views/templating#blade-comments). - [Added simpler environment management](/docs/install#environments). +- Added `Blade::extend()` method to define custom blade compilers. - Added `View::exists` method. - Use [Memcached](http://php.net/manual/en/book.memcached.php) API instead of older [Memcache](http://php.net/manual/en/book.memcache.php) API. - Added support for bundles outside of the bundle directory. diff --git a/laravel/file.php b/laravel/file.php index e5bf8f5a..efb46dec 100644 --- a/laravel/file.php +++ b/laravel/file.php @@ -1,4 +1,4 @@ -get('sp'); * * // Return a default value if the line doesn't exist - * $line = Lang::line('validation.required', null, 'Default'); + * $line = Lang::line('validation.required')->get(null, 'Default'); * * * @param string $language @@ -249,4 +249,4 @@ class Lang { return (string) $this->get(); } -} \ No newline at end of file +} diff --git a/laravel/request.php b/laravel/request.php index 37f408ec..028670f1 100644 --- a/laravel/request.php +++ b/laravel/request.php @@ -1,4 +1,4 @@ -