- nginx_merge_locations function now supports locations that are in one lin...

ftimme

2013-01-14 0297666a7a0e961d3d8eeea56b3f067e35e4cdd9

 server/plugins-available/backup_plugin.inc.php

@@ -61,7 +61,7 @@
      global $app,$conf;
      
      $backup_id = intval($data);
      $backup = $app->db->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id");
      $backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id");
      
      if(is_array($backup)) {