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