
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--

#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }

#msg ul { overflow: auto; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<title>[11868] trunk/wp-admin/includes/media.php:

  Add global JS vars and actions to the media uploader iframe</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11868">11868</a></dd>

<dt>Author</dt> <dd>azaozz</dd>

<dt>Date</dt> <dd>2009-08-24 00:09:39 +0000 (Mon, 24 Aug 2009)</dd>

</dl>


<h3>Log Message</h3>

<pre>Add global JS vars and actions to the media uploader iframe</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludesmediaphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (11867 => 11868)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/media.php        2009-08-21 17:26:31 UTC (rev 11867)

+++ trunk/wp-admin/includes/media.php        2009-08-24 00:09:39 UTC (rev 11868)

</span><span class="lines">@@ -316,13 +316,19 @@

</span><span class="cx"> &lt;script type=&quot;text/javascript&quot;&gt;

</span><span class="cx"> //&lt;![CDATA[

</span><span class="cx"> addLoadEvent = function(func){if(typeof jQuery!=&quot;undefined&quot;)jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};

</span><del>-var userSettings = {'url':'&lt;?php echo SITECOOKIEPATH; ?&gt;','uid':'&lt;?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user-&gt;ID; ?&gt;','time':'&lt;?php echo time() ?&gt;'};

</del><ins>+var userSettings = {'url':'&lt;?php echo SITECOOKIEPATH; ?&gt;','uid':'&lt;?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user-&gt;ID; ?&gt;','time':'&lt;?php echo time(); ?&gt;'};

+var ajaxurl = '&lt;?php echo admin_url('admin-ajax.php'); ?&gt;', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup';

</ins><span class="cx"> //]]&gt;

</span><span class="cx"> &lt;/script&gt;

</span><span class="cx"> &lt;?php

</span><ins>+do_action('admin_enqueue_scripts', 'media-upload-popup');

+do_action('admin_print_styles-media-upload-popup');

</ins><span class="cx"> do_action('admin_print_styles');

</span><ins>+do_action('admin_print_scripts-media-upload-popup');

</ins><span class="cx"> do_action('admin_print_scripts');

</span><ins>+do_action('admin_head-media-upload-popup');

</ins><span class="cx"> do_action('admin_head');

</span><ins>+

</ins><span class="cx"> if ( is_string($content_func) )

</span><span class="cx">         do_action( &quot;admin_head_{$content_func}&quot; );

</span><span class="cx"> ?&gt;

</span></span></pre>

</div>

</div>


</body>

</html>