Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #94 from emanuele45/master

Typo, credits, etc.
emanuele45 12 years ago
parent
d521bbb602 3be461e99d
commit
10492d4d53
4 changed files with 3 additions and 4 deletions
Split View Show Diff Stats
  1. 1 1
      Sources/MessageIndex.php
  2. 0 1
      Sources/Post.php
  3. 0 2
      Sources/Profile-Modify.php
  4. 2 0
      Sources/Who.php

+ 1 - 1
Sources/MessageIndex.php
View File 

@@ -572,7 +572,7 @@ function MessageIndex()
 
 	if (!empty($options['display_quick_mod']) && !empty($context['topics']))
 
 	{
 
 		$context['can_markread'] = $context['user']['is_logged'];
 
-		$context['can_lopck'] = allowedTo('lock_any');
 
+		$context['can_lock'] = allowedTo('lock_any');
 
 		$context['can_sticky'] = allowedTo('make_sticky') && !empty($modSettings['enableStickyTopics']);
 
 		$context['can_move'] = allowedTo('move_any');
 
 		$context['can_remove'] = allowedTo('remove_any');

+ 0 - 1
Sources/Post.php
View File 

@@ -2182,7 +2182,6 @@ function Post2()
 
 		$context['linktree'][] = array(
 
 			'url' => $scripturl . '?topic=' . $topic . '.0',
 
 			'name' => $_POST['subject'],
 
-			'extra_before' => $settings['linktree_inline'] ? $txt['topic'] . ': ' : ''
 
 		);
 
 
 		if (isset($_REQUEST['msg']))

+ 0 - 2
Sources/Profile-Modify.php
View File 

@@ -670,8 +670,6 @@ function loadProfileFields($force_reload = false)
 
 			'permission' => 'profile_extra',
 
 		),
 
 	);
 
-	
-	call_integration_hook('integrate_profile_fields', array(&$profile_fields));
 
 
 	call_integration_hook('integrate_load_profile_fields', array($profile_fields));

+ 2 - 0
Sources/Who.php
View File 

@@ -694,6 +694,8 @@ function Credits($in_admin = false)
 
 			'<a href="http://jquery.org/">JQuery</a> | &copy; John Resig | Licensed under <a href="http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt">The MIT License (MIT)</a>',
 
 			'<a href="http://cherne.net/brian/resources/jquery.hoverIntent.html">hoverIntent</a> | &copy; Brian Cherne | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 
 			'<a href="http://users.tpg.com.au/j_birch/plugins/superfish/">Superfish</a> | &copy; Joel Birch | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 
+			'<a href="http://www.sceditor.com/">SCEditor</a> | &copy; Sam Clarke | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 
+			'<a href="http://wayfarerweb.com/jquery/plugins/animadrag/">animaDrag</a> | &copy; Abel Mohler | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 
 		),
 
 	);