Skip to content

Commit

Permalink
Merge branch 'master' of github.com:straup/parallel-ogram
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisaaronland committed Dec 18, 2012
2 parents 25e8fa0 + a3f0c0d commit fc98d1b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions www/include/config.php.example
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
# This is where your Instagram photos will be stored
# It should have a trailing slash e.g. /usr/local/parallelogram-static/

$GLOBALS['cfg']['instagram_static_path'] = ''
$GLOBALS['cfg']['instagram_static_path'] = '';

# The 'instagram_static_url/path' flags needs to match the Alias directive
# in your Apache config. Note that the 'instagram_static_url' config is a
# relative path; relative to the root URL which is assigned separately.
# See also: https://github.com/straup/parallel-ogram/blob/master/apache/parallel-ogram.conf.example

$GLOBALS['cfg']['instagram_static_url'] = 'static/'
$GLOBALS['cfg']['instagram_static_url'] = 'static/';

# Invite codes – these are used to limit who can register
# to have their photos backed up. You'll need to do a
Expand Down Expand Up @@ -204,4 +204,4 @@

$GLOBALS['cfg']['allow_prefetch'] = 0;

?>
?>
4 changes: 3 additions & 1 deletion www/instagram_likes_user.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@

$rsp = instagram_likes_for_user($owner, $more);

$pagination_url = instagram_urls_for_user_likes($owner);

$GLOBALS['smarty']->assign_by_ref("photos", $rsp['rows']);
$GLOBALS['smarty']->assign_by_ref("owner", $owner);

$GLOBALS['smarty']->assign("pagination_url", $pagination_url);
$GLOBALS['smarty']->display("page_instagram_likes_user.txt");
exit();
?>

0 comments on commit fc98d1b

Please sign in to comment.