diff options
| -rw-r--r-- | engine/lib/users.php | 8 | ||||
| -rw-r--r-- | pages/friends/add.php (renamed from friends/add.php) | 0 | ||||
| -rw-r--r-- | pages/friends/collections.php (renamed from friends/collections.php) | 0 | ||||
| -rw-r--r-- | pages/friends/edit.php (renamed from friends/edit.php) | 0 | ||||
| -rw-r--r-- | pages/friends/index.php (renamed from friends/index.php) | 0 | ||||
| -rw-r--r-- | pages/friends/of.php (renamed from friends/of.php) | 0 | ||||
| -rw-r--r-- | pages/friends/pickercallback.php (renamed from friends/pickercallback.php) | 2 | ||||
| -rw-r--r-- | views/default/friends/collection.php | 2 | ||||
| -rw-r--r-- | views/default/friends/collectiontabs.php | 4 |
9 files changed, 8 insertions, 8 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 5d16decb7..05311ab9d 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1133,7 +1133,7 @@ function friends_page_handler($page_elements) { if (get_loggedin_userid() == page_owner()) { // collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access) } - require_once(dirname(dirname(dirname(__FILE__))) . "/friends/index.php"); + require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php"); } /** @@ -1147,7 +1147,7 @@ function friends_of_page_handler($page_elements) { if (get_loggedin_userid() == page_owner()) { // collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access) } - require_once(dirname(dirname(dirname(__FILE__))) . "/friends/of.php"); + require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php"); } /** @@ -1159,14 +1159,14 @@ function collections_page_handler($page_elements) { if ($page_elements[0] == "add") { set_page_owner(get_loggedin_userid()); collections_submenu_items(); - require_once(dirname(dirname(dirname(__FILE__))) . "/friends/add.php"); + require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/add.php"); } else { if ($user = get_user_by_username($page_elements[0])) { set_page_owner($user->getGUID()); if (get_loggedin_userid() == page_owner()) { collections_submenu_items(); } - require_once(dirname(dirname(dirname(__FILE__))) . "/friends/collections.php"); + require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/collections.php"); } } } diff --git a/friends/add.php b/pages/friends/add.php index 0adbd7a63..0adbd7a63 100644 --- a/friends/add.php +++ b/pages/friends/add.php diff --git a/friends/collections.php b/pages/friends/collections.php index 25ab98c4c..25ab98c4c 100644 --- a/friends/collections.php +++ b/pages/friends/collections.php diff --git a/friends/edit.php b/pages/friends/edit.php index c164a819e..c164a819e 100644 --- a/friends/edit.php +++ b/pages/friends/edit.php diff --git a/friends/index.php b/pages/friends/index.php index b7f0a2a75..b7f0a2a75 100644 --- a/friends/index.php +++ b/pages/friends/index.php diff --git a/friends/of.php b/pages/friends/of.php index a64b9cb6e..a64b9cb6e 100644 --- a/friends/of.php +++ b/pages/friends/of.php diff --git a/friends/pickercallback.php b/pages/friends/pickercallback.php index 4fe08b505..006ca20e5 100644 --- a/friends/pickercallback.php +++ b/pages/friends/pickercallback.php @@ -9,7 +9,7 @@ */ // Load Elgg engine -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); +require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); global $CONFIG; // Get callback type (list or picker) diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php index ddd0a0ed0..5683d5982 100644 --- a/views/default/friends/collection.php +++ b/views/default/friends/collection.php @@ -45,7 +45,7 @@ if ($friends = $vars['collection']->entities) { <script type="text/javascript"> $(document).ready(function () { - $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>'); + $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>'); }); </script> diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php index 9a6577671..43a8aef46 100644 --- a/views/default/friends/collectiontabs.php +++ b/views/default/friends/collectiontabs.php @@ -32,7 +32,7 @@ $(document).ready(function () { $('a.collectionmembers<?php echo $friendspicker; ?>').click(function () { // load collection members pane - $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>'); + $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>'); // remove selected state from previous tab $(this).parent().parent().find("li.selected").removeClass("selected"); @@ -44,7 +44,7 @@ $(document).ready(function () { $('a.editmembers<?php echo $friendspicker; ?>').click(function () { // load friends picker pane - $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>'); + $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>'); // remove selected state from previous tab $(this).parent().parent().find("li.selected").removeClass("selected"); |