Refs #4904. Forwarding pre and post-1.7.5 blog urls.

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 34ea5a01c339204144865f3888087854867e58c9..1ccfe4dc4b488a93d3533748f7cb146637f87b68 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -396,6 +396,14 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) {
 
 /**
  * Forward to the new style of URLs
+ * 
+ * Pre-1.7.5
+ * Group blogs page: /blog/group:<container_guid>/
+ * Group blog view:  /blog/group:<container_guid>/read/<guid>/<title>
+ * 1.7.5-1.8
+ * Group blogs page: /blog/owner/group:<container_guid>/
+ * Group blog view:  /blog/read/<guid>
+ * 
  *
  * @param string $page
  */
@@ -403,12 +411,16 @@ function blog_url_forwarder($page) {
        global $CONFIG;
 
        // group usernames
-       if (substr_count($page[1], 'group:')) {
-               preg_match('/group\:([0-9]+)/i', $page[1], $matches);
+       if (substr_count("$page[0]/$page[1]", 'group:')) {
+               preg_match('/group\:([0-9]+)/i', "$page[0]/$page[1]", $matches);
                $guid = $matches[1];
                $entity = get_entity($guid);
                if ($entity) {
-                       $url = "{$CONFIG->wwwroot}blog/group/$guid/all?view=" . elgg_get_viewtype();
+                       if (isset($page[2])) {
+                               $url = "{$CONFIG->wwwroot}blog/view/$page[2]/?view=" . elgg_get_viewtype();
+                       } else {
+                               $url = "{$CONFIG->wwwroot}blog/group/$guid/all?view=" . elgg_get_viewtype();
+                       }
                        register_error(elgg_echo("changebookmark"));
                        forward($url);
                }

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 9faf1794e9035e7041440b826da73c578a82e1d9..8cbaf5cca9c04b8dfcb51209320a874b10b4a5c6 100644 (file)
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -99,8 +99,7 @@ function blog_page_handler($page) {
 
        elgg_load_library('elgg:blog');
 
-       // @todo remove the forwarder in 1.9
-       // forward to correct URL for blog pages pre-1.7.5
+       // forward to correct URL for blog pages pre-1.8
        blog_url_forwarder($page);
 
        // push all blogs breadcrumb