From f01d6a8266797c15155734002727496c0f0e8648 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 1 Jul 2008 13:44:13 +0000
Subject: Toolbar -> topbar in profile icons

git-svn-id: https://code.elgg.org/elgg/trunk@1233 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/actions/cropicon.php           | 6 +++---
 mod/profile/actions/iconupload.php         | 6 +++---
 mod/profile/icon.php                       | 2 +-
 mod/profile/views/default/profile/icon.php | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mod/profile/actions/cropicon.php b/mod/profile/actions/cropicon.php
index d52c6b02c..d13a765c4 100644
--- a/mod/profile/actions/cropicon.php
+++ b/mod/profile/actions/cropicon.php
@@ -22,7 +22,7 @@
 		$filehandler->setFilename("profile/" . $user->username . "master" . ".jpg");
 		$filename = $filehandler->getFilenameOnFilestore();
 		
-		$toolbar = get_resized_image_from_existing_file($filename,16,16, true, $x1, $y1, $x2, $y2);
+		$topbar = get_resized_image_from_existing_file($filename,16,16, true, $x1, $y1, $x2, $y2);
 		$tiny = get_resized_image_from_existing_file($filename,25,25, true, $x1, $y1, $x2, $y2);
 		$small = get_resized_image_from_existing_file($filename,40,40, true, $x1, $y1, $x2, $y2);
 		$medium = get_resized_image_from_existing_file($filename,100,100, true, $x1, $y1, $x2, $y2);
@@ -45,9 +45,9 @@
 					$filehandler->open("write");
 					$filehandler->write($tiny);
 					$filehandler->close();
-					$filehandler->setFilename("profile/" . $_SESSION['user']->username . "toolbar.jpg");
+					$filehandler->setFilename("profile/" . $_SESSION['user']->username . "topbar.jpg");
 					$filehandler->open("write");
-					$filehandler->write($toolbar);
+					$filehandler->write($topbar);
 					$filehandler->close();
 					
 					$user->x1 = $x1;
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
index a82327825..115836eb6 100644
--- a/mod/profile/actions/iconupload.php
+++ b/mod/profile/actions/iconupload.php
@@ -15,7 +15,7 @@
 				isloggedin()
 			) {
 				
-				$toolbar = get_resized_image_from_uploaded_file('profileicon',16,16, true);
+				$topbar = get_resized_image_from_uploaded_file('profileicon',16,16, true);
 				$tiny = get_resized_image_from_uploaded_file('profileicon',25,25, true);
 				$small = get_resized_image_from_uploaded_file('profileicon',40,40, true);
 				$medium = get_resized_image_from_uploaded_file('profileicon',100,100, true);
@@ -45,9 +45,9 @@
 					$filehandler->open("write");
 					$filehandler->write($tiny);
 					$filehandler->close();
-					$filehandler->setFilename("profile/" . $_SESSION['user']->username . "toolbar.jpg");
+					$filehandler->setFilename("profile/" . $_SESSION['user']->username . "topbar.jpg");
 					$filehandler->open("write");
-					$filehandler->write($toolbar);
+					$filehandler->write($topbar);
 					$filehandler->close();
 					$filehandler->setFilename("profile/" . $_SESSION['user']->username . "master.jpg");
 					$filehandler->open("write");
diff --git a/mod/profile/icon.php b/mod/profile/icon.php
index fc4f377ce..73a29b56f 100644
--- a/mod/profile/icon.php
+++ b/mod/profile/icon.php
@@ -20,7 +20,7 @@
 		
 	// Get the size
 		$size = strtolower(get_input('size'));
-		if (!in_array($size,array('large','medium','small','tiny','master','toolbar')))
+		if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
 			$size = "medium";
 		
 	// Try and get the icon
diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 426b8d9bb..c3a8b13c9 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -27,7 +27,7 @@
 		}
 			
 	// Get size
-		if (!in_array($vars['size'],array('small','medium','large','tiny','master','toolbar')))
+		if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar')))
 			$vars['size'] = "medium";
 			
 	// Get any align and js
-- 
cgit v1.2.3