From baeb7353153924489d8d79a36d9b21c28c5f2ac4 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sun, 25 Mar 2012 19:43:42 +0200
Subject: [PATCH 1/3] small fixes

---
 view/theme/diabook-blue/theme.php |  8 ++++----
 view/theme/diabook/theme.php      | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 6149b12ded..2c878e6f05 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -33,7 +33,7 @@ function diabook_community_info(){
 			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
 		0,
-		12
+		9
 	);
 	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
 	if(count($r)) {
@@ -61,7 +61,7 @@ function diabook_community_info(){
 			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
 			GROUP BY `uri`
 			ORDER BY `T1`.`created` DESC
-			LIMIT 0,10",
+			LIMIT 0,5",
 			$a->get_baseurl(),$a->get_baseurl()
 			);
 
@@ -109,7 +109,7 @@ function diabook_community_info(){
 				AND `user`.`blockwall`=0
 				AND `user`.`hidewall`=0
 				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 12",
+				LIMIT 0, 9",
 				dbesc(t('Contact Photos')),
 				dbesc(t('Profile Photos'))
 				);
@@ -184,7 +184,7 @@ function diabook_community_info(){
 
 
 //profile_side at networkpages
-if ($a->argv[0] === "network"){
+if ($a->argv[0] === "network" && local_user()){
 
 	// USER MENU
 	if(local_user()) {
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 29cc64c187..5b87e31424 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -36,7 +36,7 @@ function diabook_community_info(){
 			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
 		0,
-		12
+		9
 	);
 	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
 	if(count($r)) {
@@ -64,7 +64,7 @@ function diabook_community_info(){
 			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
 			GROUP BY `uri`
 			ORDER BY `T1`.`created` DESC
-			LIMIT 0,10",
+			LIMIT 0,5",
 			$a->get_baseurl(),$a->get_baseurl()
 			);
 
@@ -112,7 +112,7 @@ function diabook_community_info(){
 				AND `user`.`blockwall`=0
 				AND `user`.`hidewall`=0
 				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 12",
+				LIMIT 0, 9",
 				dbesc(t('Contact Photos')),
 				dbesc(t('Profile Photos'))
 				);
@@ -189,7 +189,7 @@ function diabook_community_info(){
 
 
 //profile_side at networkpages
-if ($a->argv[0] === "network"){
+if ($a->argv[0] === "network" && local_user()){
 
 	// USER MENU
 	if(local_user()) {
@@ -251,6 +251,14 @@ $a->page['htmlhead'] .= <<< EOT
  $(function() {
 	$('a.lightbox').fancybox(); // Select all links with lightbox class
  });
+ 
+ $(document).ready(function ()
+$('iframe').each(function()
+var url = $(this).attr("src");
+$(this).attr("src",url+"?wmode=transparent");
+);
+);
+ 
  </script>
 EOT;
 

From 38b30c1d10c83900e18c2b2440ac61a984a60bf3 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 17:06:17 -0400
Subject: [PATCH 2/3] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  small fixes
  enotify plugin hook
  NOTIFY_SYSTEM

* master:

From aa33815d3c73435f15b1e30721ddb0af1faf8f5e Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 17:06:38 -0400
Subject: [PATCH 3/3] urgent fix to dispy-dark theme.php

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index cded68c489..9b6ea76bf3 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -127,7 +127,7 @@ $(document).ready(function() {
 </script>
 EOT;
 
-function dispy_community_info() {
+function dispydark_community_info() {
 	$a = get_app();
 
 	$fostitJS = "javascript: (function() {