Skip to content

Commit bb108c1

Browse files
maki10maki10
authored
Merge pull request #137 from systeminc/development
Fixing issue with different MySQL version
2 parents a0acc26 + e7827d1 commit bb108c1

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

‎src/Http/Controllers/AdminController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function anyUploadTinyImage(Request $request)
9999
$allowed = ['jpg', 'jpeg', 'gif', 'png'];
100100

101101
foreach ($request->file('files') as $file) {
102-
if ($file->isValid() && in_array($file->getClientOriginalExtension(), $allowed) && strpos($directory, 'images/tiny') !== false) {
102+
if ($file->isValid() && in_array($file->getClientOriginalExtension(), $allowed) && strpos($directory, 'images/tiny') != false) {
103103
$original = $this->cleanSpecialChars($file->getClientOriginalName());
104104

105105
$original_image = Image::make($file)->encode();
@@ -122,7 +122,7 @@ public function postDeleteTinyImage(Request $request)
122122
{
123123
$path = $request->get('path');
124124

125-
if (Storage::exists($path) && strpos($path, 'images/tiny') !== false) {
125+
if (Storage::exists($path) && strpos($path, 'images/tiny') != false) {
126126
Storage::delete($path);
127127
}
128128

‎src/Http/Controllers/GalleriesController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function postUpdate(Request $request, $gallery_id, $image_id = false)
100100
{
101101
$gallery = Gallery::find($gallery_id);
102102

103-
if ($gallery->key !== $request->key && Gallery::where(['key' => $request->key])->first()) {
103+
if ($gallery->key != $request->key && Gallery::where(['key' => $request->key])->first()) {
104104
return back()->with(['error' => 'This key exists']);
105105
}
106106

@@ -210,7 +210,7 @@ public function getEditElement($element_id)
210210
{
211211
$element = GalleryElement::find($element_id);
212212

213-
$mime = empty($element->content) || $element->page_element_type_id !== 3 ? null : Storage::mimeType('public/'.$element->content);
213+
$mime = empty($element->content) || $element->page_element_type_id != 3 ? null : Storage::mimeType('public/'.$element->content);
214214

215215
return view('admin::galleries.elements.edit-element', compact('element', 'mime'));
216216
}

‎src/Http/Controllers/PagesController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public function getEditElement($element_id)
218218
$keys = explode('.', $element->key);
219219
$key = $keys[1];
220220

221-
$mime = empty($element->content) || $element->page_element_type_id !== 3 ? null : Storage::mimeType('public/'.$element->content);
221+
$mime = empty($element->content) || $element->page_element_type_id != 3 ? null : Storage::mimeType('public/'.$element->content);
222222

223223
return view('admin::pages.edit-element', compact('element', 'mime', 'key'));
224224
}
@@ -297,7 +297,7 @@ public function getDeleteElement(Request $request, $element_id)
297297
*/
298298
private function checkIfIsChangedElementPrefixAndUpdatePrefix($elements_prefix, $page)
299299
{
300-
if ($page->elements_prefix !== $elements_prefix) {
300+
if ($page->elements_prefix != $elements_prefix) {
301301
foreach (PageElement::wherePageId($page->id)->get() as $element) {
302302
$element_key = explode('.', $element->key);
303303

‎src/resources/views/galleries/elements/edit-element.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454

5555
@elseif ($element->page_element_type_id == 3 || old('page_element_type_id') == 3)
5656

57-
@if (strstr($mime, 'image') !== false)
57+
@if (strstr($mime, 'image') != false)
5858
<div class="cf" style="position: relative">
5959
<img src="{{ asset('storage') .'/'. $element->content }}" alt="" style="max-width: 200px; width: 100%; background-color: #ddd;" class="left">
6060
<div class="cf">
6161
<input type="hidden" name="content" value="{{ $element->content }}">
6262
<a href="galleries/images/delete-element-file/{{ $element->id }}" class="button remove-item file image left">Delete file</a>
6363
</div>
6464
</div>
65-
@elseif ($mime !== null)
65+
@elseif ($mime != null)
6666
<div class="cf" style="position: relative">
6767
<a href="{{ asset('storage') .'/'. $element->content }}" download class="button item left">{{ $element->title }}</a>
6868
<div class="cf">

‎src/resources/views/layouts/admin.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@section('body')
1616
<header class="cf">
1717
<div class="header-top">
18-
<a href="" class="logo"><img src="{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->source !== null) ? asset('storage').'/'.SystemInc\LaravelAdmin\Setting::first()->source : 'images/logo.png' }}" alt="SystemInc Laravel admin logo"></a>
18+
<a href="" class="logo"><img src="{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->source != null) ? asset('storage').'/'.SystemInc\LaravelAdmin\Setting::first()->source : 'images/logo.png' }}" alt="SystemInc Laravel admin logo"></a>
1919
</div>
2020

2121
<div class="header-menu cf">

‎src/resources/views/layouts/document.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44

5-
<title>{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->title !== null) ? SystemInc\LaravelAdmin\Setting::first()->title : 'SYSTEM INC Admin panel' }}</title>
5+
<title>{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->title != null) ? SystemInc\LaravelAdmin\Setting::first()->title : 'SYSTEM INC Admin panel' }}</title>
66
<base href="{{ url('/'.config('laravel-admin.route_prefix')) }}/">
77

88
<meta name="csrf-token" content="{{ csrf_token() }}">

‎src/resources/views/login.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@section('body')
1010

1111
<div class="logo-login">
12-
<a href="" class="logo"><img src="{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->source !== null) ? asset('storage').'/'.SystemInc\LaravelAdmin\Setting::first()->source : 'images/logo.png' }}" alt="SystemInc Laravel admin logo"></a>
12+
<a href="" class="logo"><img src="{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->source != null) ? asset('storage').'/'.SystemInc\LaravelAdmin\Setting::first()->source : 'images/logo.png' }}" alt="SystemInc Laravel admin logo"></a>
1313
</div>
1414

1515
<div class="login-form">

‎src/resources/views/pages/edit-element.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454

5555
@elseif ($element->page_element_type_id == 3 || old('page_element_type_id') == 3)
5656

57-
@if (strstr($mime, 'image') !== false)
57+
@if (strstr($mime, 'image') != false)
5858
<div class="cf" style="position: relative">
5959
<img src="{{ asset('storage').'/'.$element->content }}" alt="" style="max-width: 200px; width: 100%; background-color: #ddd;" class="left">
6060
<div class="cf">
6161
<input type="hidden" name="content" value="{{ $element->content }}">
6262
<a href="pages/delete-element-file/{{ $element->id }}" class="button remove-item file image left">Delete file</a>
6363
</div>
6464
</div>
65-
@elseif ($mime !== null)
65+
@elseif ($mime != null)
6666
<div class="cf" style="position: relative">
6767
<a href="{{ asset('storage').'/'.$element->content }}" download class="button item left">{{ $element->title }}</a>
6868
<div class="cf">

‎src/resources/views/pages/edit.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
@foreach ($pages as $key => $parent)
8080

81-
@if ($parent->id !== $page->id)
81+
@if ($parent->id != $page->id)
8282
<option value="{{ $parent->id }}" {{ $parent->id == $page->parent_id ? 'selected="selected"' : '' }}>{{ $parent->title }}</option>
8383
@endif
8484

‎src/resources/views/pdf/invoice.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<table style="width: 100%;">
2828
<tr>
2929
<td style="width: 60%">
30-
<img src="{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->source !== null) ? url('/').'/'.config('laravel-admin.route_prefix').'/'.asset('storage').'/'.SystemInc\LaravelAdmin\Setting::first()->source : url('/').'/'.config('laravel-admin.route_prefix').'/images/logo.png' }}">
30+
<img src="{{ (!empty(SystemInc\LaravelAdmin\Setting::first()) && SystemInc\LaravelAdmin\Setting::first()->source != null) ? url('/').'/'.config('laravel-admin.route_prefix').'/'.asset('storage').'/'.SystemInc\LaravelAdmin\Setting::first()->source : url('/').'/'.config('laravel-admin.route_prefix').'/images/logo.png' }}">
3131
</td>
3232
<td style="width: 40%">
3333
<table>

0 commit comments

Comments
 (0)