Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop

loadedcommerce · Apr 21, 2015 · 48a4ce9 · 48a4ce9
2 parents aab4bd8 + b25e4fd
commit 48a4ce9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/catalog/admin/includes/applications/updates/classes/updates.php b/catalog/admin/includes/applications/updates/classes/updates.php
@@ -777,7 +777,7 @@ public static function fullBackup() {
     if (utility::execEnabled() === true && utility::isLinux() === true) {
       try {
         //exec(CFG_APP_ZIP . ' -r ' . DIR_FS_WORK . 'updates/' . $backup_file . ' ' . DIR_FS_CATALOG . '* -x \*.zip\*');
-        exec(CFG_APP_ZIP . ' -r ' . DIR_FS_WORK . 'updates/' . $backup_file . ' ' . DIR_FS_CATALOG . '* -x "/home/loadedne/www/sandbox/datazen/www/loaded7/catalog/images/products/*" -x "*.cache" -x "*.zip" -x "php_error*" -x "*.gif" -x "*.jpg" -x "*.jpeg" -x "*.png" -x "*.sql" -x "*.tgz" -x "*.tar" -x "*.gz"');
+        exec(CFG_APP_ZIP . ' -r ' . DIR_FS_WORK . 'updates/' . $backup_file . ' ' . DIR_FS_CATALOG . '* -x "' . DIR_FS_CATALOG . DIR_WS_IMAGES . 'products/*" -x "*.cache" -x "*.zip" -x "php_error*" -x "*.gif" -x "*.jpg" -x "*.jpeg" -x "*.png" -x "*.sql" -x "*.tgz" -x "*.tar" -x "*.gz"');
       } catch ( Exception $e ) {  
         return array('rpcStatus' => 0);
       } 

diff --git a/catalog/includes/modules/actions/cart_add.php b/catalog/includes/modules/actions/cart_add.php
@@ -54,11 +54,7 @@ function execute() {
             lc_redirect(lc_href_link(FILENAME_PRODUCTS, $lC_Product->getKeyword()));
           }
         }
-
-echo "<pre>";
-print_r($_POST);
-echo "</pre>";
-die('77');        
+
         if (isset($_POST['quantity']) && is_array($_POST['quantity'])) {
           foreach($_POST['quantity'] as $product_id => $quantity) {
             $lC_ShoppingCart->add((int)$product_id, (int)$quantity);