Permalink
Browse files

Merge branch 'release-0.4-alpha'

  • Loading branch information...
2 parents a0225f9 + 3192e85 commit 87561147655b90efcb232b7b2bbce437b66b9416 @deiu deiu committed Jun 15, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 footer.php
  2. +2 −2 include.php
  3. +2 −0 lib/functions.php
View
@@ -4,7 +4,7 @@
</div>
<footer class="footer">
<div class="container" align="center">
- © 2012 - <a href="http://myprofile-project.org">MyProfile</a> v.0.4-alpha
+ © 2012 - <a href="http://myprofile-project.org">MyProfile</a> v.0.4-alpha (stable)
</div>
</footer>
</body>
View
@@ -153,7 +153,7 @@
// add friend and display confirmation
$confirmation = $_SESSION['myprofile']->add_friend(urldecode($_REQUEST['uri']));
- $_SESSION['myprofile'] = new MyProfile($webid, $base_uri, SPARQL_ENDPOINT);
+ $_SESSION['myprofile'] = new MyProfile($_SESSION['webid'], $base_uri, SPARQL_ENDPOINT);
$_SESSION['myprofile']->load();
}
@@ -162,7 +162,7 @@
// remove friend and display confirmation
$confirmation = $_SESSION['myprofile']->del_friend(urldecode($_REQUEST['uri']));
- $_SESSION['myprofile'] = new MyProfile($webid, $base_uri, SPARQL_ENDPOINT);
+ $_SESSION['myprofile'] = new MyProfile($_SESSION['webid'], $base_uri, SPARQL_ENDPOINT);
$_SESSION['myprofile']->load();
}
View
@@ -17,6 +17,8 @@ function sparql_lookup($string, $base_uri, $endpoint) {
?webid foaf:name ?name .
?webid foaf:nick ?nick .
FILTER (regex(?name, "' . $string . '", "i") || regex(?nick, "' . $string . '", "i") || regex(?webid, "' . $string . '", "i"))
+ MINUS { ?webid a foaf:Person .
+ FILTER (regex(?webid, "nodeID", "i")) }
}';
$result = $sparql->query($query);

0 comments on commit 8756114

Please sign in to comment.