aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--languages/en.php1
-rw-r--r--search.php27
-rw-r--r--start.php2
3 files changed, 25 insertions, 5 deletions
diff --git a/languages/en.php b/languages/en.php
index fca507407..4802308ff 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -103,6 +103,7 @@
'tidypics:actiondelete' => 'Delete',
'tidypics:actioncancel' => 'Cancel',
'tidypics:inthisphoto' => 'In this photo',
+ 'tidypics:usertag' => "Photos tagged with user %s",
'tidypics:phototagging:success' => 'Photo tag was successfully added',
'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
diff --git a/search.php b/search.php
index 2899d2c3f..b7b67295d 100644
--- a/search.php
+++ b/search.php
@@ -2,22 +2,41 @@
include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
- // Set context
set_context('search');
// Get user guid
$guid = get_input('guid');
$user = get_entity($guid);
-// if ($user)
-// $user->name;
+
+ if ($user)
+ $title = sprintf(elgg_echo('tidypics:usertag'), $user->name);
+ else
+ $title = "User does not exist";
- $title = $user->name;
+ // create main column
$body = elgg_view_title($title);
$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image');
+
+ // Set up submenus
+ if (isloggedin()) {
+ add_submenu_item( elgg_echo("album:yours"),
+ $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username,
+ 'tidypics-b' );
+ }
+ add_submenu_item( elgg_echo('album:all'),
+ $CONFIG->wwwroot . "pg/photos/world/",
+ 'tidypics-z');
+ add_submenu_item( elgg_echo('tidypics:mostrecent'),
+ $CONFIG->wwwroot . 'pg/photos/mostrecent',
+ 'tidypics-z');
+
+
+
$body = elgg_view_layout('two_column_left_sidebar','',$body);
+
page_draw($title,$body);
diff --git a/start.php b/start.php
index 6318a3da1..dec7e36ed 100644
--- a/start.php
+++ b/start.php
@@ -149,7 +149,7 @@
'tidypics');
}
- add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name),
+ add_submenu_item( elgg_echo('album:all'),
$CONFIG->wwwroot . "pg/photos/world/",
'tidypics-z');
add_submenu_item( elgg_echo('tidypics:mostrecent'),