Patched function shortcut issue (see PR #61).

furey · Mar 22, 2019 · d1d1379 · d1d1379
1 parent e00880a
commit d1d1379
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/resources/views/includes.blade.php b/resources/views/includes.blade.php
@@ -132,16 +132,16 @@ function tinx_query($class, ...$args)
         ${!! $name !!}_ = {!! $class !!}::latest($latestColumn)->first() ?: app('{!! $class !!}');
         array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}', ${!! $name !!});
         array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}_', ${!! $name !!}_);
+        if (!function_exists('{!! $name !!}')) {
+            function {!! $name !!}(...$args) {
+                return tinx_query('{!! $class !!}', ...$args);
+            }
+        }
     } catch (Throwable $e) {
         @include('tinx::on-name-error')
     } catch (Exception $e) {
         @include('tinx::on-name-error')
     }
-    if (!function_exists('{!! $name !!}')) {
-        function {!! $name !!}(...$args) {
-            return tinx_query('{!! $class !!}', ...$args);
-        }
-    }
 @endforeach
 unset($latestColumn);
 

diff --git a/resources/views/on-name-error.blade.php b/resources/views/on-name-error.blade.php
@@ -4,16 +4,16 @@
         ${!! $name !!}_ = app('{!! $class !!}');
         array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}', ${!! $name !!});
         array_set($GLOBALS, 'tinx.shortcuts.{!! $name !!}_', ${!! $name !!}_);
+        if (!function_exists('{!! $name !!}')) {
+            function {!! $name !!}(...$args) {
+                return '{!! $class !!}';
+            }
+        }
     } catch (Throwable $e) {
         tinx_forget_name('{!! $class !!}');
     } catch (Exception $e) {
         tinx_forget_name('{!! $class !!}');
     }
-    if (!function_exists('{!! $name !!}')) {
-        function {!! $name !!}(...$args) {
-            return '{!! $class !!}';
-        }
-    }
 @else
     tinx_forget_name('{!! $class !!}');
 @endif