From 1c7dd7f532189357e89c06a00f1f6bfdd7454cd0 Mon Sep 17 00:00:00 2001
From: Ozh <ozh@ozh.org>
Date: Thu, 7 Feb 2013 16:10:21 +0000
Subject: [PATCH] Wrong function names. Fixes Issue 1298.

git-svn-id: http://yourls.googlecode.com/svn/trunk@847 12232710-3e20-11de-b438-597f59cd7555
---
 admin/plugins.php      | 28 ++++++++++++++--------------
 includes/functions.php |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin/plugins.php b/admin/plugins.php
index 66ac500..8eadce3 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -48,7 +48,7 @@
 // Handle message upon succesfull (de)activation
 if( isset( $_GET['success'] ) ) {
 	if( $_GET['success'] == 'activated' OR $_GET['success'] == 'deactivated' ) {
-		yourls_add_notice( 'Plugin '.__($_GET['success']) );
+		yourls_add_notice( 'Plugin '.yourls__($_GET['success']) );
 	}
 }
 
@@ -57,7 +57,7 @@
 yourls_html_menu();
 ?>
 
-	<h2><?php _e("Plugins"); ?></h2>
+	<h2><?php yourls_e("Plugins"); ?></h2>
 	
 	<?php
 	$plugins = (array)yourls_get_plugins();
@@ -65,19 +65,19 @@
 	
 	$count = count( $plugins );
 	$count_active = yourls_has_active_plugins();
-    $plugins_count = $count.' '.yourls_plural( __('plugin'), $count );
+    $plugins_count = $count.' '.yourls_plural( yourls__('plugin'), $count );
 	?>
 	
-	<p id="plugin_summary"><?php printf(__('You currently have <strong>%d</strong> installed, and <strong>%d</strong> activated'), $plugins_count, $count_active ); ?></p>
+	<p id="plugin_summary"><?php printf(yourls__('You currently have <strong>%d</strong> installed, and <strong>%d</strong> activated'), $plugins_count, $count_active ); ?></p>
 
 	<table id="main_table" class="tblSorter" cellpadding="0" cellspacing="1">
 	<thead>
 		<tr>
-			<th><?php _e('Plugin Name'); ?></th>
-			<th><?php _e('Version'); ?></th>
-			<th><?php _e('Description'); ?></th>
-			<th><?php _e('Author'); ?></th>
-			<th><?php _e('Action'); ?></th>
+			<th><?php yourls_e('Plugin Name'); ?></th>
+			<th><?php yourls_e('Version'); ?></th>
+			<th><?php yourls_e('Description'); ?></th>
+			<th><?php yourls_e('Author'); ?></th>
+			<th><?php yourls_e('Action'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -112,11 +112,11 @@
 		if( yourls_is_active_plugin( $file ) ) {
 			$class = 'active';
 			$action_url = yourls_nonce_url( 'manage_plugins', yourls_add_query_arg( array('action' => 'deactivate', 'plugin' => $plugindir ) ) );
-			$action_anchor = __('Deactivate');
+			$action_anchor = yourls__('Deactivate');
 		} else {
 			$class = 'inactive';
 			$action_url = yourls_nonce_url( 'manage_plugins', yourls_add_query_arg( array('action' => 'activate', 'plugin' => $plugindir ) ) );
-			$action_anchor = __('Activate');
+			$action_anchor = yourls__('Activate');
 		}
 			
 		// Other "Fields: Value" in the header? Get them too
@@ -151,11 +151,11 @@
 	<?php } ?>
 	</script>
 	
-	<p><?php _e('If something goes wrong after you activate a plugin and you cannot use YOURLS or access this page, simply rename or delete its directory, or rename the plugin file to something different than <code>plugin.php</code>.'); ?></p>
+	<p><?php yourls_e('If something goes wrong after you activate a plugin and you cannot use YOURLS or access this page, simply rename or delete its directory, or rename the plugin file to something different than <code>plugin.php</code>.'); ?></p>
 	
-	<h3><?php _e('More plugins'); ?></h3>
+	<h3><?php yourls_e('More plugins'); ?></h3>
 	
-	<p><?php _e('For more plugins, head to the official <a href="http://yourls.org/pluginlist">Plugin list</a>.'); ?></p>
+	<p><?php yourls_e('For more plugins, head to the official <a href="http://yourls.org/pluginlist">Plugin list</a>.'); ?></p>
 
 	
 <?php yourls_html_footer(); ?>
diff --git a/includes/functions.php b/includes/functions.php
index 8ccc784..5781922 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1755,8 +1755,8 @@ function yourls_deprecated_function( $function, $version, $replacement = null )
 	// Allow plugin to filter the output error trigger
 	if ( WP_DEBUG && yourls_apply_filters( 'deprecated_function_trigger_error', true ) ) {
 		if ( ! is_null($replacement) )
-			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+			trigger_error( sprintf( yourls__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
 		else
-			trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			trigger_error( sprintf( yourls__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
 	}
 }
\ No newline at end of file
-- 
2.45.0