No commit message

mainwp · Aug 29, 2014 · 2a01dab · 2a01dab
1 parent 79d60d8
commit 2a01dab
Show file tree

Hide file tree

Showing 32 changed files with 28 additions and 1 deletion.
diff --git a/class/MainWPBackup.class.php b/class/MainWPBackup.class.php
@@ -571,6 +571,8 @@ public function addFileFromStringToPCLZip($file, $string, $filepath)
    		return false;
    	}
 
+    protected $gcCnt = 0;
+
     function addFileToZip($path, $zipEntryName)
     {
         if (time() - $this->lastRun > 20)
@@ -590,6 +592,7 @@ function addFileToZip($path, $zipEntryName)
         // return $zip->addFile( $path, $zipEntryName );
 
         $this->zipArchiveSizeCount += filesize($path);
+        $this->gcCnt++;
 
         //5 mb limit!
         if (filesize($path) > 5 * 1024 * 1024)
@@ -609,6 +612,12 @@ function addFileToZip($path, $zipEntryName)
 			unset($contents);
         }
 
+        if ($this->gcCnt > 20)
+        {
+            @gc_collect_cycles();
+            $this->gcCnt = 0;
+        }
+
         //Over limits?
         if ((($this->file_descriptors > 0) && ($this->zipArchiveFileCount > $this->file_descriptors))) // || $this->zipArchiveSizeCount >= (31457280 * 2))
         {

diff --git a/class/MainWPClone.class.php b/class/MainWPClone.class.php
@@ -32,7 +32,18 @@ public static function print_scripts()
         wp_enqueue_script('jquery-ui-autocomplete');
         wp_enqueue_script('jquery-ui-progressbar');
         wp_enqueue_script('jquery-ui-dialog');
-        wp_enqueue_style('jquery-ui-style', plugins_url('/css/jquery-ui-1.10.4.min.css'));
+
+        global $wp_scripts;
+        $ui = $wp_scripts->query('jquery-ui-core');
+        $version = $ui->ver;
+        if (MainWPHelper::startsWith($version, '1.10'))
+        {
+            wp_enqueue_style('jquery-ui-style', plugins_url('/css/1.10.4/jquery-ui.min.css', dirname(__FILE__)));
+        }
+        else
+        {
+            wp_enqueue_style('jquery-ui-style', plugins_url('/css/1.11.1/jquery-ui.min.css', dirname(__FILE__)));
+        }
     }
 
     public static function renderHeader()

diff --git a/css/images/animated-overlay.gif → css/1.10.4/images/animated-overlay.gif b/css/images/animated-overlay.gif → css/1.10.4/images/animated-overlay.gif
diff --git a/css/images/ui-bg_flat_0_aaaaaa_40x100.png → ...0.4/images/ui-bg_flat_0_aaaaaa_40x100.png b/css/images/ui-bg_flat_0_aaaaaa_40x100.png → ...0.4/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/css/images/ui-bg_flat_75_ffffff_40x100.png → ....4/images/ui-bg_flat_75_ffffff_40x100.png b/css/images/ui-bg_flat_75_ffffff_40x100.png → ....4/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/css/images/ui-bg_glass_55_fbf9ee_1x400.png → ....4/images/ui-bg_glass_55_fbf9ee_1x400.png b/css/images/ui-bg_glass_55_fbf9ee_1x400.png → ....4/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/css/images/ui-bg_glass_65_ffffff_1x400.png → ....4/images/ui-bg_glass_65_ffffff_1x400.png b/css/images/ui-bg_glass_65_ffffff_1x400.png → ....4/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/css/images/ui-bg_glass_75_dadada_1x400.png → ....4/images/ui-bg_glass_75_dadada_1x400.png b/css/images/ui-bg_glass_75_dadada_1x400.png → ....4/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/css/images/ui-bg_glass_75_e6e6e6_1x400.png → ....4/images/ui-bg_glass_75_e6e6e6_1x400.png b/css/images/ui-bg_glass_75_e6e6e6_1x400.png → ....4/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/css/images/ui-bg_glass_95_fef1ec_1x400.png → ....4/images/ui-bg_glass_95_fef1ec_1x400.png b/css/images/ui-bg_glass_95_fef1ec_1x400.png → ....4/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/.../ui-bg_highlight-soft_75_cccccc_1x100.png → .../ui-bg_highlight-soft_75_cccccc_1x100.png b/.../ui-bg_highlight-soft_75_cccccc_1x100.png → .../ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/css/images/ui-icons_222222_256x240.png → ...1.10.4/images/ui-icons_222222_256x240.png b/css/images/ui-icons_222222_256x240.png → ...1.10.4/images/ui-icons_222222_256x240.png
diff --git a/css/images/ui-icons_2e83ff_256x240.png → ...1.10.4/images/ui-icons_2e83ff_256x240.png b/css/images/ui-icons_2e83ff_256x240.png → ...1.10.4/images/ui-icons_2e83ff_256x240.png
diff --git a/css/images/ui-icons_454545_256x240.png → ...1.10.4/images/ui-icons_454545_256x240.png b/css/images/ui-icons_454545_256x240.png → ...1.10.4/images/ui-icons_454545_256x240.png
diff --git a/css/images/ui-icons_888888_256x240.png → ...1.10.4/images/ui-icons_888888_256x240.png b/css/images/ui-icons_888888_256x240.png → ...1.10.4/images/ui-icons_888888_256x240.png
diff --git a/css/images/ui-icons_cd0a0a_256x240.png → ...1.10.4/images/ui-icons_cd0a0a_256x240.png b/css/images/ui-icons_cd0a0a_256x240.png → ...1.10.4/images/ui-icons_cd0a0a_256x240.png
diff --git a/css/jquery-ui-1.10.4.min.css → css/1.10.4/jquery-ui.min.css b/css/jquery-ui-1.10.4.min.css → css/1.10.4/jquery-ui.min.css
diff --git a/css/1.11.1/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/css/1.11.1/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/css/1.11.1/images/ui-bg_diagonals-thick_20_666666_40x40.png b/css/1.11.1/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/css/1.11.1/images/ui-bg_flat_10_000000_40x100.png b/css/1.11.1/images/ui-bg_flat_10_000000_40x100.png
diff --git a/css/1.11.1/images/ui-bg_glass_100_f6f6f6_1x400.png b/css/1.11.1/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/css/1.11.1/images/ui-bg_glass_100_fdf5ce_1x400.png b/css/1.11.1/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/css/1.11.1/images/ui-bg_glass_65_ffffff_1x400.png b/css/1.11.1/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/css/1.11.1/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/css/1.11.1/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/css/1.11.1/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/css/1.11.1/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/css/1.11.1/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/css/1.11.1/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/css/1.11.1/images/ui-icons_222222_256x240.png b/css/1.11.1/images/ui-icons_222222_256x240.png
diff --git a/css/1.11.1/images/ui-icons_228ef1_256x240.png b/css/1.11.1/images/ui-icons_228ef1_256x240.png
diff --git a/css/1.11.1/images/ui-icons_ef8c08_256x240.png b/css/1.11.1/images/ui-icons_ef8c08_256x240.png
diff --git a/css/1.11.1/images/ui-icons_ffd27a_256x240.png b/css/1.11.1/images/ui-icons_ffd27a_256x240.png
diff --git a/css/1.11.1/images/ui-icons_ffffff_256x240.png b/css/1.11.1/images/ui-icons_ffffff_256x240.png
diff --git a/css/1.11.1/jquery-ui.min.css b/css/1.11.1/jquery-ui.min.css