Changeset 1982801

Timestamp:

11/29/2018 07:41:27 PM (7 years ago)

Author:

navigationnorth

Message:

updates for v0.6.7

Location:

wp-oer/trunk

Files:

• oer_template/archive-resource.php (added)
• open-educational-resources.php (modified) (6 diffs)

wp-oer/trunk/open-educational-resources.php

@@ -4 +4 @@
  Plugin URI:   https://www.wp-oer.com
  Description:  Open Educational Resource management and curation, metadata publishing, and alignment to Common Core State Standards.
- Version:      0.6.6
+ Version:      0.6.7
  Author:       Navigation North
  Author URI:   https://www.navigationnorth.com
@@ -11 +11 @@
  License URI:  https://www.gnu.org/licenses/gpl-3.0.html
 
- Copyright (C) 2017 Navigation North
+ Copyright (C) 2018 Navigation North
 
  This program is free software: you can redistribute it and/or modify
@@ -37 +37 @@
 define( 'OER_PLUGIN_NAME', 'WP OER Plugin' );
 define( 'OER_ADMIN_PLUGIN_NAME', 'WP OER Plugin');
-define( 'OER_VERSION', '0.6.6' );
+define( 'OER_VERSION', '0.6.7' );
 
 include_once(OER_PATH.'includes/oer-functions.php');
@@ -279 +279 @@
         $file = $theme_file;
     } else {
-        $file = OER_PATH . '/oer_template/' . $template;
+        $file = OER_PATH . 'oer_template/' . $template;
     }
 
@@ -324 +324 @@
     // Get Current Object if it belongs to Resource Category taxonomy
     $resource_term = get_term_by( 'id' , $_id , 'resource-subject-area' );
-
+    //var_dump($resource_term);
     //Check if the loaded resource is a category
     if ($resource_term && !is_wp_error( $resource_term )) {
@@ -354 +354 @@
     if ($resource_tag && !is_wp_error( $resource_tag )) {
         return oer_get_template_hierarchy('tag-resource');
+    } elseif (is_post_type_archive('resource')) {
+        return oer_get_template_hierarchy('archive-resource');
     } else {
         return $template;
     }
+ }
+
+ /**
+ * Add filter to use plugin default archive template
+ **/
+add_filter( 'archive_template' , 'oer_custom_archive_template' );
+
+/**
+ * Function to choose template for the resource archive
+ **/
+function oer_custom_archive_template( $template ) {
+    global $wp_query;
+
+    if (is_post_type_archive('resource')) {
+        $template = realpath(oer_get_template_hierarchy('archive-resource'));
+    }
+
+    return $template;
  }