move vars inside if

1 files changed, 9 insertions, 9 deletions

diff --git a/apk_browser.module b/apk_browser.module
index 70e37ab..2a5532b 100644
--- a/apk_browser.module
+++ b/apk_browser.module
@@ -481,19 +481,19 @@ function apk_browser_cleanup() {
 //create an url from the commit, and if we find it in aggregator we add a title
 function apk_browser_commit_url($commit) {
     $fid = variable_get('apk_import_aggregator','0');
+    $attributes = array();
+    $href = str_replace('%commit%', $commit, variable_get('apk_import_commit_url', ''));
     if (module_exists('aggregator') && $fid) {
 	if (!empty($commit)) {
             $search = '%' . $commit . '%';
         }
         $title = db_query("SELECT title FROM {aggregator_item} WHERE link LIKE :commit AND fid = :fid", array(':commit' => $search, ':fid' => $fid))->fetchField();
-    }
-    $href = str_replace('%commit%', $commit, variable_get('apk_import_commit_url', ''));
-    $attributes = empty($title) ? array() : array('title' => check_plain($title), 'class' => 'with-tooltip');
-    //if we get title from query we add tooltip js script
-    if ($title) {
-        $path = drupal_get_path('module', 'apk_browser');
-        drupal_add_js($path . '/tooltip/tooltip.js');
-        drupal_add_js('jQuery().ready(function(){jQuery(".with-tooltip").simpletooltip();});', 'inline');
+	if ($title) {
+	    $attributes = array('title' => check_plain($title), 'class' => 'with-tooltip');
+	    $path = drupal_get_path('module', 'apk_browser');
+	    drupal_add_js($path . '/tooltip/tooltip.js');
+	    drupal_add_js('jQuery().ready(function(){jQuery(".with-tooltip").simpletooltip();});', 'inline');
+        }
     }
     return l($commit, $href, array('attributes' => $attributes));
 }
@@ -551,7 +551,7 @@ function apk_browser_package_table($vars) {
     $fields[t('Build date')] = empty($vars['apk_build_time']) ? $empty : date('r', $vars['apk_build_time'][0]['safe_value']);
     $fields[t('Commit')] = empty($vars['apk_commit']) ? $empty : apk_browser_commit_url($vars['apk_commit']['0']['value']);
     //only show origin if its different then itself
-    if ($vars['apk_origin'][0]['value'] != $vars['title']) {
+    if (!empty($vars['apk_origin']) && ($vars['apk_origin'][0]['value'] != $vars['title'])) {
         $fields[t('Origin')] = $origin;
     }
     //to prevent misunderstanding only display when needed.