]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
better solution for 1.7 file compatibility than pull request 471
authorCash Costello <cash.costello@gmail.com>
Wed, 23 Jan 2013 12:16:15 +0000 (07:16 -0500)
committerCash Costello <cash.costello@gmail.com>
Wed, 23 Jan 2013 12:16:15 +0000 (07:16 -0500)
mod/blog/start.php
mod/bookmarks/start.php
mod/file/start.php

index 8cbaf5cca9c04b8dfcb51209320a874b10b4a5c6..eb6eee05f5f19eb0e5dd4f4db5ea4a16e0105e0e 100644 (file)
@@ -124,9 +124,12 @@ function blog_page_handler($page) {
                        $params = blog_get_page_content_archive($user->guid, $page[2], $page[3]);
                        break;
                case 'view':
-               case 'read': // Elgg 1.7 compatibility
                        $params = blog_get_page_content_read($page[1]);
                        break;
+               case 'read': // Elgg 1.7 compatibility
+                       register_error(elgg_echo("changebookmark"));
+                       forward("blog/view/{$page[1]}");
+                       break;
                case 'add':
                        gatekeeper();
                        $params = blog_get_page_content_edit($page_type, $page[1]);
index 66e22b56504da177e090f2128573a28ef0c60acc..3846f51657f3a7a59cdf4676d43d620e85b0b8cc 100644 (file)
@@ -125,11 +125,14 @@ function bookmarks_page_handler($page) {
                        include "$pages/friends.php";
                        break;
 
-               case "read":
                case "view":
                        set_input('guid', $page[1]);
                        include "$pages/view.php";
                        break;
+               case 'read': // Elgg 1.7 compatibility
+                       register_error(elgg_echo("changebookmark"));
+                       forward("bookmarks/view/{$page[1]}");
+                       break;
 
                case "add":
                        gatekeeper();
index 172042332eed549849632fca410bae2f93573a3c..7ea050ce347642f81d0a1a17a122af7b26b7a179 100644 (file)
@@ -121,8 +121,11 @@ function file_page_handler($page) {
                        file_register_toggle();
                        include "$file_dir/friends.php";
                        break;
-               case 'view':
                case 'read': // Elgg 1.7 compatibility
+                       register_error(elgg_echo("changebookmark"));
+                       forward("file/view/{$page[1]}");
+                       break;
+               case 'view':
                        set_input('guid', $page[1]);
                        include "$file_dir/view.php";
                        break;