| @@ 1126-1134 (lines=9) @@ | ||
| 1123 | 'val' => (!empty($content[$name]) ? $content[$name] : null), |
|
| 1124 | ), |
|
| 1125 | ); |
|
| 1126 | if (Vfs::proppatch($path,$mergeprop)) |
|
| 1127 | { |
|
| 1128 | $content['old'][$name] = $content[$name]; |
|
| 1129 | $msg .= lang('Setting for document merge saved.'); |
|
| 1130 | } |
|
| 1131 | else |
|
| 1132 | { |
|
| 1133 | $msg .= lang('Saving setting for document merge failed!'); |
|
| 1134 | } |
|
| 1135 | } |
|
| 1136 | else |
|
| 1137 | { |
|
| @@ 1189-1200 (lines=12) @@ | ||
| 1186 | } |
|
| 1187 | if ($props) |
|
| 1188 | { |
|
| 1189 | if (Vfs::proppatch($path,$props)) |
|
| 1190 | { |
|
| 1191 | foreach($props as $prop) |
|
| 1192 | { |
|
| 1193 | $content['old'][$prop['name']] = $prop['val']; |
|
| 1194 | } |
|
| 1195 | $msg .= lang('Properties saved.'); |
|
| 1196 | } |
|
| 1197 | else |
|
| 1198 | { |
|
| 1199 | $msg .= lang('Saving properties failed!'); |
|
| 1200 | } |
|
| 1201 | } |
|
| 1202 | } |
|
| 1203 | elseif ($content['eacl'] && $content['is_owner']) |
|