Merge pull request #971 from gburton/1.0.6.3

1.0.6.3
gburton · May 29, 2020 · 961faa9 · 961faa9
2 parents 123ebfb + f4faac5
commit 961faa9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/admin/categories.php b/admin/categories.php
@@ -1112,7 +1112,7 @@ function addNewPiForm() {
             $category_seo_description_string .= '<div class="input-group-prepend">';
               $category_seo_description_string .= '<span class="input-group-text">'. tep_image(tep_catalog_href_link('includes/languages/' . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], '', 'SSL'), $languages[$i]['name']) . '</span>';
             $category_seo_description_string .= '</div>';
-            $category_seo_description_string .= tep_draw_textarea_field('categories_seo_description[' . $languages[$i]['id'] . ']', 'soft', '80', '10', tep_get_category_seo_keywords($cInfo->categories_id, $languages[$i]['id']));
+            $category_seo_description_string .= tep_draw_textarea_field('categories_seo_description[' . $languages[$i]['id'] . ']', 'soft', '80', '10', tep_get_category_seo_description($cInfo->categories_id, $languages[$i]['id']));
           $category_seo_description_string .= '</div>';
           $category_seo_keywords_string .= '<div class="input-group mb-1">';
             $category_seo_keywords_string .= '<div class="input-group-prepend">';

diff --git a/admin/modules.php b/admin/modules.php
@@ -348,7 +348,7 @@
   }
 
   if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
-    echo '<div class="col-12 col-sm-3">';
+    echo '<div class="col-12 col-sm-4">';
     $box = new box();
     echo $box->infoBox($heading, $contents);
     echo '</div>';

diff --git a/includes/modules/product_listing.php b/includes/modules/product_listing.php
@@ -11,6 +11,8 @@
 */
 
   $num_list = (isset($_GET['view']) && ($_GET['view'] == 'all') ) ? 999999 : MAX_DISPLAY_SEARCH_RESULTS;
+  $num_list = $OSCOM_Hooks->call('siteWide', 'numList');
+
   $listing_split = new splitPageResults($listing_sql, $num_list, 'p.products_id');
 ?>
 

diff --git a/includes/version.php b/includes/version.php
@@ -1 +1 @@
-1.0.6.2
+1.0.6.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,8 @@ @@
     */
       $num_list = (isset($_GET['view']) && ($_GET['view'] == 'all') ) ? 999999 : MAX_DISPLAY_SEARCH_RESULTS;
+      $num_list = $OSCOM_Hooks->call('siteWide', 'numList');
       $listing_split = new splitPageResults($listing_sql, $num_list, 'p.products_id');
     ?>
@@ Expand Down @@