@@ -56,6 +56,7 @@ public function restore()
5656 {
5757 if (class_exists ($ class = $ this ->owner_type )) {
5858 $ model = $ this ->$ class ->findOrFail ($ this ->owner_id );
59+
5960 $ model ->fill ($ this ->old_value );
6061
6162 return $ model ->save ();
@@ -117,6 +118,7 @@ public function getCustomFieldsAttribute()
117118 {
118119 if (class_exists ($ class = $ this ->owner_type )) {
119120 $ customFields = [];
121+
120122 foreach ($ this ->getCustomFields ($ class ) as $ field => $ message ) {
121123 if (is_array ($ message ) && isset ($ message [$ this ->type ])) {
122124 $ customFields [$ field ] = $ this ->resolveCustomMessage ($ message [$ this ->type ]);
@@ -171,16 +173,19 @@ public function resolveCustomMessage($message)
171173 preg_match_all ('/\{[\w.| ]+\}/ ' , $ message , $ segments );
172174 foreach (current ($ segments ) as $ segment ) {
173175 $ s = str_replace (['{ ' , '} ' ], '' , $ segment );
176+
174177 $ keys = explode ('| ' , $ s );
175178
176179 if (empty ($ keys [1 ]) && isset ($ keys [2 ])) {
177180 $ keys [1 ] = $ this ->callback ($ keys [2 ]);
178181 }
179182
180- $ valueSegmented = $ this ->getValueSegmented ($ this , $ keys [0 ], isset ($ keys [1 ]) ? $ keys [1 ] : false );
183+ $ valueSegmented = $ this ->getValueSegmented ($ this , $ keys [0 ], isset ($ keys [1 ]) ? $ keys [1 ] : ' ' );
184+
181185 if (!$ valueSegmented ) {
182186 return false ;
183187 }
188+
184189 $ message = str_replace ($ segment , $ valueSegmented , $ message );
185190 }
186191
0 commit comments