diff options
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/tpl/jot-header.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/smarty3/jot-header.tpl | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/include/zot.php b/include/zot.php index a06ae352b..e8fba603a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -865,6 +865,8 @@ function zot_import($arr) { $result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries); } + + } if($result) $return = array_merge($return,$result); diff --git a/version.inc b/version.inc index edb059ec1..dc4c42e3d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-04-19.288 +2013-04-21.290 diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 1c4c43903..4736f2137 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -88,7 +88,7 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").prettyPhoyo({ + $("a#jot-perms-icon").prettyPhoto({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -252,7 +252,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.prettyPhoto(data); + $.fancybox(data); $("#id_term").keypress(function(){ $(this).css("border-color",bordercolor); }) @@ -270,7 +270,7 @@ function enableOnUser(){ // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.prettyPhoto.close(); + $.fancybox.close(); } else { $("#id_term").css("border-color","#FF0000"); } diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl index c1b6d62e2..ab22b3775 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -93,7 +93,7 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").prettyPhoyo({ + $("a#jot-perms-icon").prettyPhoto({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -257,7 +257,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.prettyPhoto(data); + $.fancybox(data); $("#id_term").keypress(function(){ $(this).css("border-color",bordercolor); }) @@ -275,7 +275,7 @@ function enableOnUser(){ // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.prettyPhoto.close(); + $.fancybox.close(); } else { $("#id_term").css("border-color","#FF0000"); } |