From 81d6884ecad771f4b4f2d8be7572d1a89deaab10 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 19 May 2011 11:21:53 +0000
Subject: Fixes #3462 empty classes directory is no longer treated as an error

git-svn-id: http://code.elgg.org/elgg/trunk@9100 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'engine/lib/elgglib.php')

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e67f8b627..170750849 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -33,21 +33,15 @@ function _elgg_autoload($class) {
  *
  * @param string $dir The dir to look in
  *
- * @return true
+ * @return void
  * @since 1.8.0
  */
 function elgg_register_classes($dir) {
 	$classes = elgg_get_file_list($dir, array(), array(), array('.php'));
 
-	if (!$classes) {
-		return false;
-	}
-
 	foreach ($classes as $class) {
 		elgg_register_class(basename($class, '.php'), $class);
 	}
-
-	return true;
 }
 
 /**
-- 
cgit v1.2.3


From 4d11e2d761919130aa572203e303baa0d8fe00d8 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 20:06:30 +0000
Subject: topbar icons were pushing the site title. Forced the elgg logo and
 avatar to behave. Adding overflow hidden to the topbar div would prevent
 future problems but cause issues for those adding drop down menus

git-svn-id: http://code.elgg.org/elgg/trunk@9183 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php                    |  3 ++-
 engine/lib/users.php                      |  1 +
 views/default/css/elements/navigation.php | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'engine/lib/elgglib.php')

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 170750849..08f3d5e7c 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2002,8 +2002,9 @@ function elgg_init() {
 	elgg_register_menu_item('topbar', array(
 		'name' => 'elgg_logo',
 		'href' => 'http://www.elgg.org/',
-		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" />",
+		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" width=\"38\" height=\"20\" />",
 		'priority' => 1,
+		'link_class' => 'elgg-topbar-logo',
 	));
 	
 	// Sets a blacklist of words in the current language.
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 8333888a2..59bfa1259 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1453,6 +1453,7 @@ function users_pagesetup() {
 			'href' =>  $user->getURL(),
 			'text' => "<img src=\"$icon_url\" alt=\"$user->name\" title=\"$title\" class=\"$class\" />",
 			'priority' => 100,
+			'link_class' => 'elgg-topbar-avatar',
 		));
 
 		elgg_register_menu_item('topbar', array(
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index e4709cb27..ff27acd4b 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,7 +130,7 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding: 2px 15px 0;
 	color: #eee;
 	margin-top: 1px;
 }
@@ -144,6 +144,17 @@
 	float: right;
 }
 
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
 /* ***************************************
 	SITE MENU
 *************************************** */
-- 
cgit v1.2.3


From cf30721c8fa78bd9b2d10a387735c0080021b3c5 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 12 Jun 2011 20:13:30 +0000
Subject: Fixes #3480 not requiring a timestamp when using the js/css page
 handler

git-svn-id: http://code.elgg.org/elgg/trunk@9191 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engine/lib/elgglib.php')

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 08f3d5e7c..df78515f2 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1789,8 +1789,9 @@ function elgg_cacheable_view_page_handler($page, $type) {
 		// translates to the url /js/calendars/jquery.fullcalendar.min.<ts>.js
 		// and the view js/calendars/jquery.fullcalendar.min
 		// we ignore the last two dots for the ts and the ext.
+		// Additionally, the timestamp is optional.
 		$page = implode('/', $page);
-		$regex = '|(.+)\.([^\.]+)\.([^.]+)$|';
+		$regex = '|(.+?)\.([\d]+\.)?\w+$|';
 		preg_match($regex, $page, $matches);
 		$view = $matches[1];
 		$return = elgg_view("$type/$view");
-- 
cgit v1.2.3