Merge master into use_javascript_for_phrase_edit

# Conflicts: # app/phrases/phrase_edit.php
2024-12-02 12:02:22 -04:00
parent 81e842fd11 bb76878156
commit 618c51b458
131 changed files with 283 additions and 277 deletions
@@ -204,7 +204,7 @@ class settings {
 		$record[$table_name][0][$table_prefix.'_setting_description'] = $description;

 		//grant temporary permissions
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add($table_prefix.'_setting_add', 'temp');
 		$p->add($table_prefix.'_setting_edit', 'temp');