fixes

microweber · Mar 20, 2015 · a794569 · a794569
1 parent 6f782b5
commit a794569
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/index.php b/index.php
@@ -4,11 +4,15 @@
     exit("Error: You must have PHP version 5.4 or greater to run Microweber");
 }
 
-if(!function_exists("mcrypt_encrypt")) {
+if (!function_exists("mcrypt_encrypt")) {
     exit("Error: You must install the mcrypt PHP extension to run Microweber");
 }
+if (!function_exists('openssl_random_pseudo_bytes')) {
+    exit('Error: OpenSSL PHP extension is required to run Microweber');
+}
+
 
-if(function_exists("date_default_timezone_set")) {
+if (function_exists("date_default_timezone_set")) {
     @date_default_timezone_set(@date_default_timezone_get());
 }
 
@@ -31,7 +35,7 @@
 |
 */
 
-require __DIR__.'/bootstrap/autoload.php';
+require __DIR__ . '/bootstrap/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -45,7 +49,7 @@
 |
 */
 
-$app = require_once __DIR__.'/bootstrap/app.php';
+$app = require_once __DIR__ . '/bootstrap/app.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -62,7 +66,7 @@
 $kernel = $app->make('Illuminate\Contracts\Http\Kernel');
 
 $response = $kernel->handle(
-	$request = Illuminate\Http\Request::capture()
+    $request = Illuminate\Http\Request::capture()
 );
 
 $response->send();

diff --git a/userfiles/modules/content/controllers/Front.php b/userfiles/modules/content/controllers/Front.php
@@ -318,13 +318,9 @@ function index($params, $config)
                 $post_params['content_type'] = 'post';
             }
 
-
         }
 
-        if (isset($post_params['content_type']) and $post_params['content_type'] == 'product') {
-           // $post_params['subtype'] = 'product';
-          //  $post_params['content_type'] = 'post';
-        }
+
 
         if (isset($params['is_shop'])) {
             $post_params['content_type'] = 'product';
@@ -480,12 +476,13 @@ function index($params, $config)
 
                 $item['link'] = content_link($item['id']);
 
-
                 if (!isset($item['description']) or $item['description'] == '') {
                     if (isset($item['content']) and $item['content'] != '') {
                         $item['full_description'] = strip_tags($item['content']);
                         $item['description'] = character_limiter(strip_tags($item['content']), $character_limit);
-
+                    } elseif (isset($item['content_body']) and $item['content_body'] != '') {
+                        $item['full_description'] = strip_tags($item['content']);
+                        $item['description'] = character_limiter(strip_tags($item['content_body']), $character_limit);
                     }
                 } else {
                     $item['full_description'] = $item['description'];

diff --git a/userfiles/templates/liteness/layouts/shop_inner.php b/userfiles/templates/liteness/layouts/shop_inner.php
@@ -7,7 +7,9 @@
         <div class="mw-ui-row shop-product-row">
           <div class="mw-ui-col" style="width:65%">
             <div class="mw-ui-col-container">
+             <div class="edit"  field="product_media" rel="post">
               <module type="pictures" rel="content" template="product_gallery_multiline" />
+              </div>
             </div>
           </div>
           <div class="mw-ui-col" style="width:35%">