caboose-cms 0.4.85 → 0.4.86
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/app/models/caboose/block.rb +6 -2
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
YzRjY2I0Mjc3MGE5MGRjNTZjYjdhNzczZjc3YzAxOTg0NjY5ODUyOQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YzcyMzBiMDU5ZTNlN2U1MDM0ODY1MWIwZWM1ZWYxOWIzZmM0NzVmOQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NmRiOGE0NGI1NjdmMThkMjJiZGZmZjg2NGVjNDU0OWMyZmNiYzdlYWJhNDQ3
|
10
|
+
NmQ1MjZhN2NhYTEwNTZmZWJhYTI4NmQ0ODA3YzljMzZmNTliMDE4ZDFlY2Ji
|
11
|
+
Njc2ZjU1ZGU4ZmU3Mjk3NTgzNmY5N2ZkNGQ4NjZjMTc1OWNjNTA=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MTJiMTU0NTY2MTA2MTE5ZmI3YjQzNzQ3MmVkOWIzOTNhYjc3MmExNDM5MGRi
|
14
|
+
NTBiYmQ3YzQ1Y2EzNTJjODA2ZWNjN2ViYzA3NGQ0YzM4NDk4YWE1Yzc5YzY4
|
15
|
+
MGQwMWI0ZGZlNmI5NDg3NDUxMDc3ZTdkYmJjMTNjNDllYTlkM2I=
|
data/app/models/caboose/block.rb
CHANGED
@@ -160,10 +160,14 @@ class Caboose::Block < ActiveRecord::Base
|
|
160
160
|
end
|
161
161
|
else
|
162
162
|
|
163
|
-
# Check the local site first
|
164
|
-
site = options2[:site]
|
165
163
|
full_name = block.block_type.full_name
|
166
164
|
full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
|
165
|
+
|
166
|
+
# Check the local site first
|
167
|
+
site = options2[:site]
|
168
|
+
if site.nil?
|
169
|
+
self.block_message(block, "Error: site variable is nil.")
|
170
|
+
end
|
167
171
|
|
168
172
|
begin
|
169
173
|
str = view.render(:partial => "../../sites/#{site.name}/blocks/#{full_name}", :locals => options2)
|
data/lib/caboose/version.rb
CHANGED