Merge branch 'master' of https://github.com/samerton/Nameless-Resources

samerton · Jun 9, 2022 · 4035a88 · 4035a88
2 parents 89e4a04 + f943c1d
commit 4035a88
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/upload/modules/Resources/pages/resources/resource.php b/upload/modules/Resources/pages/resources/resource.php
@@ -1867,6 +1867,8 @@
                 $categories = DB::getInstance()->get('resources_categories', ['id', '<>', $resource->category_id]);
                 if (!$categories->count()) {
                     $smarty->assign('NO_CATEGORIES', $resource_language->get('resources', 'no_categories_available'));
+                } else {
+                    $smarty->assign('CATEGORIES', $categories->results());
                 }
 
                 if(Input::exists()){
@@ -1913,8 +1915,7 @@
                     'CONFIRM_CANCEL' => $language->get('general', 'confirm_cancel'),
                     'CANCEL_LINK' => URL::build('/resources/resource/' . $resource->id . '-' . Util::stringToURL($resource->name)),
                     'SUBMIT' => $language->get('general', 'submit'),
-                    'MOVE_TO' => $resource_language->get('resources', 'move_to'),
-                    'CATEGORIES' => $categories
+                    'MOVE_TO' => $resource_language->get('resources', 'move_to')
                 ]);
 
                 $template_file = 'resources/move.tpl';

diff --git a/upload/modules/Resources/pages/user/resources.php b/upload/modules/Resources/pages/user/resources.php
@@ -84,8 +84,8 @@
             'author_style' => $author->getGroupStyle(),
             'author_link' => $author->getProfileURL(),
             'latest_version' => Output::getClean($resource->version),
-            'updated' => $timeago->inWords(date('d M Y, H:i', $resource->updated), $language),
-            'updated_full' => date('d M Y, H:i', $resource->updated),
+            'updated' => $timeago->inWords($resource->updated, $language),
+            'updated_full' => date(DATE_FORMAT, $resource->updated),
             'link' => URL::build('/resources/resource/' . Output::getClean($resource->id) . '-' . Util::stringToURL($resource->name))
         ];
     }