Merge pull request #4013 from deadlybutter/removeconditional

Removes profile link conditional

Author: Joe Kent

lib/themes/dosomething/paraneue_dosomething/templates/system/partials/navigation.tpl.php

@@ -31,16 +31,12 @@
         <?php print $search_box; ?>
       </li>
       <?php if($logged_in): ?>
-        <?php if( theme_get_setting('show_profile_link') ): ?>
-          <li class="navigation__dropdown"><div class="navigation__dropdown-toggle"><i></i><p><?php print $user_identifier ?></p></div>
-            <ul>
-              <li><?php print l("My Account", 'user/'. $user->uid); ?></li>
-              <li><a id="link--logout" href="<?php print $front_page; ?>user/logout"><?php print t('Log Out'); ?></a></li>
-            </ul>
-          </li>
-        <?php else: ?>
-          <li><a id="link--logout" href="<?php print $front_page; ?>user/logout"><?php print t('Log Out'); ?></a></li>
-        <?php endif; ?>  
+        <li class="navigation__dropdown"><div class="navigation__dropdown-toggle"><i></i><p><?php print $user_identifier ?></p></div>
+          <ul>
+            <li><?php print l("My Account", 'user/'. $user->uid); ?></li>
+            <li><a id="link--logout" href="<?php print $front_page; ?>user/logout"><?php print t('Log Out'); ?></a></li>
+          </ul>
+        </li>
       <?php else: ?> 
         <li class="login"><a id="link--login" class="secondary-nav-item" href="<?php print $front_page; ?>user/login" data-modal-href="#modal--login"><?php print t('Log In'); ?></a></li>
       <?php endif; ?>

lib/themes/dosomething/paraneue_dosomething/theme-settings.php

@@ -43,10 +43,6 @@ function paraneue_dosomething_form_system_theme_settings_alter(&$form, &$form_st
       '#title' => t('Campaign Finder'),
       '#description' => t('Toggles campaign finder on homepage/expore campaigns page.')
     ),
-    'show_profile_link' => array(
-      '#title' => t('User Profile Link'),
-      '#description' => t('Toggles the user profile/create an account link in the main navigation.')
-    ),
     'show_sponsors' => array(
       '#title' => t('Show sponsors'),
       '#description' => t('Toggles the sponsors block on the home page when finder is enabled.')