Re: [Tiki-devel] [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[61682] branches/15.x

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [Tiki-devel] [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[61682] branches/15.x

luciash d' being
Hey fellow devs,

any idea why it does those property svn:mergeinfo changes on seemingly
irrelevant files and dirs?

I have used the recommended svn merge command for these backports as
shown here: https://dev.tiki.org/Merge+a+commit+from+trunk

Am I doing anything wrong?

luci


On 14.3.2017 13:40, [hidden email] wrote:

> Revision: 61682
>            http://sourceforge.net/p/tikiwiki/code/61682
> Author:   luciash
> Date:     2017-03-14 12:40:31 +0000 (Tue, 14 Mar 2017)
> Log Message:
> -----------
> [bp/r61608][REF][FIX] minichat: more of Bootstrapification, code optimalization, fixed smiley sizes (thanks marclaporte)
>
> Modified Paths:
> --------------
>      branches/15.x/templates/modules/mod-minichat.tpl
>      branches/15.x/tiki-minichat_ajax.php
>
> Property Changed:
> ----------------
>      branches/15.x/
>      branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>      branches/15.x/lib/mail/maillib.php
>      branches/15.x/lib/setup/events.php
>      branches/15.x/lib/setup/prefs.php
>      branches/15.x/lib/tikilib.php
>      branches/15.x/lib/userslib.php
>      branches/15.x/templates/
>      branches/15.x/tiki-index.php
>
> Index: branches/15.x
> ===================================================================
> --- branches/15.x 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -25,4 +25,4 ##
>   /branches/experimental/xajax_removal:31497
>   /branches/experimental/zf1-to-zf2:56612-56811
>   /branches/proposals/4.x:24005
> -/trunk:57426,57453,57455,57470,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59046-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59222,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288-59289,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59395-59398,59401,59403-59404,59408,59410,59413,59417,59423,59431-59432,59435,59437,59439-59440,59447,59449,59453,59455,59457-59458,59460,59463-59464,59468,59472,59477,59482,59484-59485,59488,59490,59492,59496,59498,59500,59502,59506,59508,59510,59520,59522,59524,59526,59529,59535,59537,59539,59544,59546,59554-59555,59560-59562,59564,59578,59580,59589,59593,59603,59605-59606,59610,59614,59616,59619,59622-59623,59627,59630,59653,59657,59659,59676,59682-59683,59686,59688-59690,59698,59707,59721,59734-59735,59746,59748-59750,59752,59762,59766,59769,59780,59810,59817,59828,59830-59831,59835,59848,59852-59853,59868,59878,59980,60013,60048,60060,60080,60082,60244,60274,60360,60364,60371-60373,60384-60385,60414-60415,60422,61283,61526,61601
> \ No newline at end of property
> +/trunk:57426,57453,57455,57470,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59046-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59222,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288-59289,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59395-59398,59401,59403-59404,59408,59410,59413,59417,59423,59431-59432,59435,59437,59439-59440,59447,59449,59453,59455,59457-59458,59460,59463-59464,59468,59472,59477,59482,59484-59485,59488,59490,59492,59496,59498,59500,59502,59506,59508,59510,59520,59522,59524,59526,59529,59535,59537,59539,59544,59546,59554-59555,59560-59562,59564,59578,59580,59589,59593,59603,59605-59606,59610,59614,59616,59619,59622-59623,59627,59630,59653,59657,59659,59676,59682-59683,59686,59688-59690,59698,59707,59721,59734-59735,59746,59748-59750,59752,59762,59766,59769,59780,59810,59817,59828,59830-59831,59835,59848,59852-59853,59868,59878,59980,60013,60048,60060,60080,60082,60244,60274,60360,60364,60371-60373,60384-60385,60414-60415,60422,61283,61526,61601,61608
> \ No newline at end of property
> Index: branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
> ===================================================================
> --- branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -24,4 +24,4 ##
>   /branches/experimental/xajax_removal/lib/core/Tiki/Command/AddonUpgradeCommand.php:31497
>   /branches/experimental/zf1-to-zf2/lib/core/Tiki/Command/AddonUpgradeCommand.php:56612-56811
>   /branches/proposals/4.x/lib/core/Tiki/Command/AddonUpgradeCommand.php:24005
> -/trunk/lib/core/Tiki/Command/AddonUpgradeCommand.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59380,61601
> \ No newline at end of property
> +/trunk/lib/core/Tiki/Command/AddonUpgradeCommand.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59380,61601,61608
> \ No newline at end of property
> Index: branches/15.x/lib/mail/maillib.php
> ===================================================================
> --- branches/15.x/lib/mail/maillib.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/lib/mail/maillib.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/lib/mail/maillib.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -24,4 +24,4 ##
>   /branches/experimental/xajax_removal/lib/mail/maillib.php:31497
>   /branches/experimental/zf1-to-zf2/lib/mail/maillib.php:56612-56811
>   /branches/proposals/4.x/lib/mail/maillib.php:24005
> -/trunk/lib/mail/maillib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58991,61601
> \ No newline at end of property
> +/trunk/lib/mail/maillib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58991,61601,61608
> \ No newline at end of property
> Index: branches/15.x/lib/setup/events.php
> ===================================================================
> --- branches/15.x/lib/setup/events.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/lib/setup/events.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/lib/setup/events.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -24,4 +24,4 ##
>   /branches/experimental/xajax_removal/lib/setup/events.php:31497
>   /branches/experimental/zf1-to-zf2/lib/setup/events.php:56612-56811
>   /branches/proposals/4.x/lib/setup/events.php:24005
> -/trunk/lib/setup/events.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58908,58957,61601
> \ No newline at end of property
> +/trunk/lib/setup/events.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58908,58957,61601,61608
> \ No newline at end of property
> Index: branches/15.x/lib/setup/prefs.php
> ===================================================================
> --- branches/15.x/lib/setup/prefs.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/lib/setup/prefs.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/lib/setup/prefs.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -24,4 +24,4 ##
>   /branches/experimental/xajax_removal/lib/setup/prefs.php:31497
>   /branches/experimental/zf1-to-zf2/lib/setup/prefs.php:56612-56811
>   /branches/proposals/4.x/lib/setup/prefs.php:24005
> -/trunk/lib/setup/prefs.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58963,61601
> \ No newline at end of property
> +/trunk/lib/setup/prefs.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58963,61601,61608
> \ No newline at end of property
> Index: branches/15.x/lib/tikilib.php
> ===================================================================
> --- branches/15.x/lib/tikilib.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/lib/tikilib.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/lib/tikilib.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -25,4 +25,4 ##
>   /branches/experimental/xajax_removal/lib/tikilib.php:31497
>   /branches/experimental/zf1-to-zf2/lib/tikilib.php:56612-56811
>   /branches/proposals/4.x/lib/tikilib.php:24005
> -/trunk/lib/tikilib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59388,59524,59554,59578,59868,61601
> \ No newline at end of property
> +/trunk/lib/tikilib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59388,59524,59554,59578,59868,61601,61608
> \ No newline at end of property
> Index: branches/15.x/lib/userslib.php
> ===================================================================
> --- branches/15.x/lib/userslib.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/lib/userslib.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/lib/userslib.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -25,4 +25,4 ##
>   /branches/experimental/xajax_removal/lib/userslib.php:31497
>   /branches/experimental/zf1-to-zf2/lib/userslib.php:56612-56811
>   /branches/proposals/4.x/lib/userslib.php:24005
> -/trunk/lib/userslib.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58957,61601
> \ No newline at end of property
> +/trunk/lib/userslib.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58957,61601,61608
> \ No newline at end of property
> Index: branches/15.x/templates
> ===================================================================
> --- branches/15.x/templates 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/templates 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/templates
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -25,4 +25,4 ##
>   /branches/experimental/xajax_removal/templates:31497
>   /branches/experimental/zf1-to-zf2/templates:56612-56811
>   /branches/proposals/4.x/templates:24005
> -/trunk/templates:57426,57478,57911,57986,58063,58995,59010,59044,59071,59121,59162,59212,59217,59222,59261,59267,59273,59281,59293-59295,59300,59303-59304,59320-59321,59325,59340-59343,59377,59395-59398,59401,59403,59408,59410,59417,59423,59435,59458,59460,59482,59496,59498,59508,59529,59544,59546,59580,59589,59605-59606,59682,59707,59750,59769,59831,59853,59878,59980,60060,60274,60360,60384-60385,60402,61601
> \ No newline at end of property
> +/trunk/templates:57426,57478,57911,57986,58063,58995,59010,59044,59071,59121,59162,59212,59217,59222,59261,59267,59273,59281,59293-59295,59300,59303-59304,59320-59321,59325,59340-59343,59377,59395-59398,59401,59403,59408,59410,59417,59423,59435,59458,59460,59482,59496,59498,59508,59529,59544,59546,59580,59589,59605-59606,59682,59707,59750,59769,59831,59853,59878,59980,60060,60274,60360,60384-60385,60402,61601,61608
> \ No newline at end of property
> Modified: branches/15.x/templates/modules/mod-minichat.tpl
> ===================================================================
> --- branches/15.x/templates/modules/mod-minichat.tpl 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/templates/modules/mod-minichat.tpl 2017-03-14 12:40:31 UTC (rev 61682)
> @@ -1,15 +1,13 @@
>   {tikimodule error=$module_params.error title=$tpl_module_title name="minichat" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
>  
> - {if $module_params.nochannelbar && $module_params.nochannelbar != "n"}
> - <div id='minichatchans' class='minichatchans' style="height:0em;visibility:hidden"></div>
> - {else}
> - <div id='minichatchans' class='minichatchans'></div>
> - {/if}
> - <div id='minichat' class='minichat' style='overflow-x: hidden; overflow-y: scroll; width: 100%; height: {$module_rows}em;'></div>
> +
> + <div id='minichatchans' class='btn-group minichatchans margin-bottom-xs'{if $module_params.nochannelbar && $module_params.nochannelbar != "n"} style="height: 0; visibility: hidden"{/if}></div>
> +
> + <div id='minichat' class='minichat well well-sm' style='overflow-x: hidden; overflow-y: auto; height: {$module_rows}em;'></div>
>  
>   <div class="minichatinputs">
>   <form class="form-horizontal" name='minichatinputform' action='javascript:minichatpost();'>
> - <div class="input-group">
> + <div class="input-group input-group-sm">
>   <input class="form-control" name='minichatinput' id='minichatinput' type='text' autocomplete='off'>
>   <span class="input-group-btn"><input class="btn btn-primary" type='submit' value="{tr}OK{/tr}"></span>
>   </div>
> @@ -98,7 +96,7 @@
>   d.style.display="none";
>  
>   d=document.getElementById('minichata_'+minichat_selectedchan.id);
> - d.setAttribute('class', 'btn btn-default minichata_unselected');
> + d.setAttribute('class', 'btn btn-default btn-xs minichata_unselected');
>  
>   minichat_selectedchan=null;
>   }
> @@ -109,7 +107,7 @@
>   d.style.display="";
>  
>   d=document.getElementById('minichata_'+c.id);
> - d.setAttribute('class', 'active btn btn-default minichata_selected');
> + d.setAttribute('class', 'active btn btn-default btn-xs minichata_selected');
>  
>   minichat_selectedchan=c;
>   }
> @@ -129,7 +127,7 @@
>   var d=minichat_newelem("div", { 'id' : 'minichatdiv_'+c.id , 'class' : 'minichatdiv' });
>   document.getElementById('minichat').appendChild(d);
>  
> - d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-default minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
> + d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-default btn-xs minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
>   d.innerHTML=c.name;
>   document.getElementById('minichatchans').appendChild(d);
>  
>
> Index: branches/15.x/tiki-index.php
> ===================================================================
> --- branches/15.x/tiki-index.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/tiki-index.php 2017-03-14 12:40:31 UTC (rev 61682)
>
> Property changes on: branches/15.x/tiki-index.php
> ___________________________________________________________________
> Modified: svn:mergeinfo
> ## -24,4 +24,4 ##
>   /branches/experimental/xajax_removal/tiki-index.php:31497
>   /branches/experimental/zf1-to-zf2/tiki-index.php:56612-56811
>   /branches/proposals/4.x/tiki-index.php:24005
> -/trunk/tiki-index.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58926,61601
> \ No newline at end of property
> +/trunk/tiki-index.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58926,61601,61608
> \ No newline at end of property
> Modified: branches/15.x/tiki-minichat_ajax.php
> ===================================================================
> --- branches/15.x/tiki-minichat_ajax.php 2017-03-14 12:34:03 UTC (rev 61681)
> +++ branches/15.x/tiki-minichat_ajax.php 2017-03-14 12:40:31 UTC (rev 61682)
> @@ -133,25 +133,26 @@
>                       $t = date("H:i", $row['ts']);
>                   }
>               }
> + //TODO: improve matching and replace with better smileys + use global lib
>               $msgtotal = "<span class='minichat_ts'>[$t]</span>&nbsp;<span class='minichat_nick'>&lt;" . ($row['nick'] === null ? '' : $row['nick']) . "&gt;</span> <span class='minichat_msg'>" . htmlentities($row['msg'], ENT_QUOTES, 'UTF-8') . "</span><br>" . $msgtotal;
>   }
> - $msgtotal = str_replace(":-D", "<img border='0' src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":D", "<img border='0' src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":-/", "<img border='0' src='img/smiles/icon_confused.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace("8-)", "<img border='0' src='img/smiles/icon_cool.gif' width='19' height='25'>", $msgtotal);
> - $msgtotal = str_replace("8)", "<img border='0' src='img/smiles/icon_cool.gif' width='19' height='25'>", $msgtotal);
> - $msgtotal = str_replace(":-)", "<img border='0' src='img/smiles/icon_smile.gif' width='16' height='16'>", $msgtotal);
> - $msgtotal = str_replace(":)", "<img border='0' src='img/smiles/icon_smile.gif' width='16' height='16'>", $msgtotal);
> - $msgtotal = str_replace(":-(", "<img border='0' src='img/smiles/icon_sad.gif' width='40' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":(", "<img border='0' src='img/smiles/icon_sad.gif' width='40' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":-|", "<img border='0' src='img/smiles/icon_neutral.gif' width='40' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":|", "<img border='0' src='img/smiles/icon_neutral.gif' width='40' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":-p", "<img border='0' src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":p", "<img border='0' src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":-o", "<img border='0' src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(":o", "<img border='0' src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(";-)", "<img border='0' src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
> - $msgtotal = str_replace(";)", "<img border='0' src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-D", "<img src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":D", "<img src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-/", "<img src='img/smiles/icon_confused.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace("8-)", "<img src='img/smiles/icon_cool.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace("8)", "<img src='img/smiles/icon_cool.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-)", "<img src='img/smiles/icon_smile.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":)", "<img src='img/smiles/icon_smile.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-(", "<img src='img/smiles/icon_sad.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":(", "<img src='img/smiles/icon_sad.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-|", "<img src='img/smiles/icon_neutral.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":|", "<img src='img/smiles/icon_neutral.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-p", "<img src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":p", "<img src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":-o", "<img src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(":o", "<img src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(";-)", "<img src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
> + $msgtotal = str_replace(";)", "<img src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>   echo "document.getElementById('minichatdiv_'+minichat_getchanid('$channel')).innerHTML=\"$msgtotal\";\n";
>   echo "document.getElementById('minichat').scrollTop=99999;\n";
>   }
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Tikiwiki-cvs mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
TikiWiki-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
Reply | Threaded
Open this post in threaded view
|

Re: [Tiki-devel] [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[61682] branches/15.x

Jonny Bradley-4
Hi Luci

I don't think you did anything wrong, it's all a bit of a mystery to everyone i think (unless you know better?)

I have been meaning to remove some of the obsolete merge info from dead branches from ages ago but we always seem to be semi-auto-merging, but not now... so here goes - deep breath!

jb



> On 14 Mar 2017, at 12:46, luciash <[hidden email]> wrote:
>
> Hey fellow devs,
>
> any idea why it does those property svn:mergeinfo changes on seemingly
> irrelevant files and dirs?
>
> I have used the recommended svn merge command for these backports as
> shown here: https://dev.tiki.org/Merge+a+commit+from+trunk
>
> Am I doing anything wrong?
>
> luci
>
>
> On 14.3.2017 13:40, [hidden email] wrote:
>> Revision: 61682
>>           http://sourceforge.net/p/tikiwiki/code/61682
>> Author:   luciash
>> Date:     2017-03-14 12:40:31 +0000 (Tue, 14 Mar 2017)
>> Log Message:
>> -----------
>> [bp/r61608][REF][FIX] minichat: more of Bootstrapification, code optimalization, fixed smiley sizes (thanks marclaporte)
>>
>> Modified Paths:
>> --------------
>>     branches/15.x/templates/modules/mod-minichat.tpl
>>     branches/15.x/tiki-minichat_ajax.php
>>
>> Property Changed:
>> ----------------
>>     branches/15.x/
>>     branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>>     branches/15.x/lib/mail/maillib.php
>>     branches/15.x/lib/setup/events.php
>>     branches/15.x/lib/setup/prefs.php
>>     branches/15.x/lib/tikilib.php
>>     branches/15.x/lib/userslib.php
>>     branches/15.x/templates/
>>     branches/15.x/tiki-index.php
>>
>> Index: branches/15.x
>> ===================================================================
>> --- branches/15.x 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -25,4 +25,4 ##
>>  /branches/experimental/xajax_removal:31497
>>  /branches/experimental/zf1-to-zf2:56612-56811
>>  /branches/proposals/4.x:24005
>> -/trunk:57426,57453,57455,57470,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59046-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59222,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288-59289,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59395-59398,59401,59403-59404,59408,59410,59413,59417,59423,59431-59432,59435,59437,59439-59440,59447,59449,59453,59455,59457-59458,59460,59463-59464,59468,59472,59477,59482,59484-59485,59488,59490,59492,59496,59498,59500,59502,59506,59508,59510,59520,59522,59524,59526,59529,59535,59537,59539,59544,59546,59554-59555,59560-59562,59564,59578,59580,59589,59593,59603,59605-59606,59610,59614,59616,59619,59622-59623,59627,59630,59653,59657,59659,59676,59682-59683,59686,59688-59690,59698,59707,5972
> 1,59734-59735,59746,59748-59750,59752,59762,59766,59769,59780,59810,59817,59828,59830-59831,59835,59848,59852-59853,59868,59878,59980,60013,60048,60060,60080,60082,60244,60274,60360,60364,60371-60373,60384-60385,60414-60415,60422,61283,61526,61601
>> \ No newline at end of property
>> +/trunk:57426,57453,57455,57470,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59046-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59222,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288-59289,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59395-59398,59401,59403-59404,59408,59410,59413,59417,59423,59431-59432,59435,59437,59439-59440,59447,59449,59453,59455,59457-59458,59460,59463-59464,59468,59472,59477,59482,59484-59485,59488,59490,59492,59496,59498,59500,59502,59506,59508,59510,59520,59522,59524,59526,59529,59535,59537,59539,59544,59546,59554-59555,59560-59562,59564,59578,59580,59589,59593,59603,59605-59606,59610,59614,59616,59619,59622-59623,59627,59630,59653,59657,59659,59676,59682-59683,59686,59688-59690,59698,59707,5972
> 1,59734-59735,59746,59748-59750,59752,59762,59766,59769,59780,59810,59817,59828,59830-59831,59835,59848,59852-59853,59868,59878,59980,60013,60048,60060,60080,60082,60244,60274,60360,60364,60371-60373,60384-60385,60414-60415,60422,61283,61526,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>> ===================================================================
>> --- branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -24,4 +24,4 ##
>>  /branches/experimental/xajax_removal/lib/core/Tiki/Command/AddonUpgradeCommand.php:31497
>>  /branches/experimental/zf1-to-zf2/lib/core/Tiki/Command/AddonUpgradeCommand.php:56612-56811
>>  /branches/proposals/4.x/lib/core/Tiki/Command/AddonUpgradeCommand.php:24005
>> -/trunk/lib/core/Tiki/Command/AddonUpgradeCommand.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59380,61601
>> \ No newline at end of property
>> +/trunk/lib/core/Tiki/Command/AddonUpgradeCommand.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59380,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/lib/mail/maillib.php
>> ===================================================================
>> --- branches/15.x/lib/mail/maillib.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/lib/mail/maillib.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/lib/mail/maillib.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -24,4 +24,4 ##
>>  /branches/experimental/xajax_removal/lib/mail/maillib.php:31497
>>  /branches/experimental/zf1-to-zf2/lib/mail/maillib.php:56612-56811
>>  /branches/proposals/4.x/lib/mail/maillib.php:24005
>> -/trunk/lib/mail/maillib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58991,61601
>> \ No newline at end of property
>> +/trunk/lib/mail/maillib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58991,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/lib/setup/events.php
>> ===================================================================
>> --- branches/15.x/lib/setup/events.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/lib/setup/events.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/lib/setup/events.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -24,4 +24,4 ##
>>  /branches/experimental/xajax_removal/lib/setup/events.php:31497
>>  /branches/experimental/zf1-to-zf2/lib/setup/events.php:56612-56811
>>  /branches/proposals/4.x/lib/setup/events.php:24005
>> -/trunk/lib/setup/events.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58908,58957,61601
>> \ No newline at end of property
>> +/trunk/lib/setup/events.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58908,58957,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/lib/setup/prefs.php
>> ===================================================================
>> --- branches/15.x/lib/setup/prefs.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/lib/setup/prefs.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/lib/setup/prefs.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -24,4 +24,4 ##
>>  /branches/experimental/xajax_removal/lib/setup/prefs.php:31497
>>  /branches/experimental/zf1-to-zf2/lib/setup/prefs.php:56612-56811
>>  /branches/proposals/4.x/lib/setup/prefs.php:24005
>> -/trunk/lib/setup/prefs.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58963,61601
>> \ No newline at end of property
>> +/trunk/lib/setup/prefs.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58963,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/lib/tikilib.php
>> ===================================================================
>> --- branches/15.x/lib/tikilib.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/lib/tikilib.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/lib/tikilib.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -25,4 +25,4 ##
>>  /branches/experimental/xajax_removal/lib/tikilib.php:31497
>>  /branches/experimental/zf1-to-zf2/lib/tikilib.php:56612-56811
>>  /branches/proposals/4.x/lib/tikilib.php:24005
>> -/trunk/lib/tikilib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59388,59524,59554,59578,59868,61601
>> \ No newline at end of property
>> +/trunk/lib/tikilib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59388,59524,59554,59578,59868,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/lib/userslib.php
>> ===================================================================
>> --- branches/15.x/lib/userslib.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/lib/userslib.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/lib/userslib.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -25,4 +25,4 ##
>>  /branches/experimental/xajax_removal/lib/userslib.php:31497
>>  /branches/experimental/zf1-to-zf2/lib/userslib.php:56612-56811
>>  /branches/proposals/4.x/lib/userslib.php:24005
>> -/trunk/lib/userslib.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58957,61601
>> \ No newline at end of property
>> +/trunk/lib/userslib.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58957,61601,61608
>> \ No newline at end of property
>> Index: branches/15.x/templates
>> ===================================================================
>> --- branches/15.x/templates 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/templates 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/templates
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -25,4 +25,4 ##
>>  /branches/experimental/xajax_removal/templates:31497
>>  /branches/experimental/zf1-to-zf2/templates:56612-56811
>>  /branches/proposals/4.x/templates:24005
>> -/trunk/templates:57426,57478,57911,57986,58063,58995,59010,59044,59071,59121,59162,59212,59217,59222,59261,59267,59273,59281,59293-59295,59300,59303-59304,59320-59321,59325,59340-59343,59377,59395-59398,59401,59403,59408,59410,59417,59423,59435,59458,59460,59482,59496,59498,59508,59529,59544,59546,59580,59589,59605-59606,59682,59707,59750,59769,59831,59853,59878,59980,60060,60274,60360,60384-60385,60402,61601
>> \ No newline at end of property
>> +/trunk/templates:57426,57478,57911,57986,58063,58995,59010,59044,59071,59121,59162,59212,59217,59222,59261,59267,59273,59281,59293-59295,59300,59303-59304,59320-59321,59325,59340-59343,59377,59395-59398,59401,59403,59408,59410,59417,59423,59435,59458,59460,59482,59496,59498,59508,59529,59544,59546,59580,59589,59605-59606,59682,59707,59750,59769,59831,59853,59878,59980,60060,60274,60360,60384-60385,60402,61601,61608
>> \ No newline at end of property
>> Modified: branches/15.x/templates/modules/mod-minichat.tpl
>> ===================================================================
>> --- branches/15.x/templates/modules/mod-minichat.tpl 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/templates/modules/mod-minichat.tpl 2017-03-14 12:40:31 UTC (rev 61682)
>> @@ -1,15 +1,13 @@
>>  {tikimodule error=$module_params.error title=$tpl_module_title name="minichat" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
>>
>> - {if $module_params.nochannelbar && $module_params.nochannelbar != "n"}
>> - <div id='minichatchans' class='minichatchans' style="height:0em;visibility:hidden"></div>
>> - {else}
>> - <div id='minichatchans' class='minichatchans'></div>
>> - {/if}
>> - <div id='minichat' class='minichat' style='overflow-x: hidden; overflow-y: scroll; width: 100%; height: {$module_rows}em;'></div>
>> +
>> + <div id='minichatchans' class='btn-group minichatchans margin-bottom-xs'{if $module_params.nochannelbar && $module_params.nochannelbar != "n"} style="height: 0; visibility: hidden"{/if}></div>
>> +
>> + <div id='minichat' class='minichat well well-sm' style='overflow-x: hidden; overflow-y: auto; height: {$module_rows}em;'></div>
>>
>>   <div class="minichatinputs">
>>   <form class="form-horizontal" name='minichatinputform' action='javascript:minichatpost();'>
>> - <div class="input-group">
>> + <div class="input-group input-group-sm">
>>   <input class="form-control" name='minichatinput' id='minichatinput' type='text' autocomplete='off'>
>>   <span class="input-group-btn"><input class="btn btn-primary" type='submit' value="{tr}OK{/tr}"></span>
>>   </div>
>> @@ -98,7 +96,7 @@
>>   d.style.display="none";
>>
>>   d=document.getElementById('minichata_'+minichat_selectedchan.id);
>> - d.setAttribute('class', 'btn btn-default minichata_unselected');
>> + d.setAttribute('class', 'btn btn-default btn-xs minichata_unselected');
>>
>>   minichat_selectedchan=null;
>>   }
>> @@ -109,7 +107,7 @@
>>   d.style.display="";
>>
>>   d=document.getElementById('minichata_'+c.id);
>> - d.setAttribute('class', 'active btn btn-default minichata_selected');
>> + d.setAttribute('class', 'active btn btn-default btn-xs minichata_selected');
>>
>>   minichat_selectedchan=c;
>>   }
>> @@ -129,7 +127,7 @@
>>   var d=minichat_newelem("div", { 'id' : 'minichatdiv_'+c.id , 'class' : 'minichatdiv' });
>>   document.getElementById('minichat').appendChild(d);
>>
>> - d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-default minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
>> + d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-default btn-xs minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
>>   d.innerHTML=c.name;
>>   document.getElementById('minichatchans').appendChild(d);
>>
>>
>> Index: branches/15.x/tiki-index.php
>> ===================================================================
>> --- branches/15.x/tiki-index.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/tiki-index.php 2017-03-14 12:40:31 UTC (rev 61682)
>>
>> Property changes on: branches/15.x/tiki-index.php
>> ___________________________________________________________________
>> Modified: svn:mergeinfo
>> ## -24,4 +24,4 ##
>>  /branches/experimental/xajax_removal/tiki-index.php:31497
>>  /branches/experimental/zf1-to-zf2/tiki-index.php:56612-56811
>>  /branches/proposals/4.x/tiki-index.php:24005
>> -/trunk/tiki-index.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58926,61601
>> \ No newline at end of property
>> +/trunk/tiki-index.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58926,61601,61608
>> \ No newline at end of property
>> Modified: branches/15.x/tiki-minichat_ajax.php
>> ===================================================================
>> --- branches/15.x/tiki-minichat_ajax.php 2017-03-14 12:34:03 UTC (rev 61681)
>> +++ branches/15.x/tiki-minichat_ajax.php 2017-03-14 12:40:31 UTC (rev 61682)
>> @@ -133,25 +133,26 @@
>>                      $t = date("H:i", $row['ts']);
>>                  }
>>              }
>> + //TODO: improve matching and replace with better smileys + use global lib
>>              $msgtotal = "<span class='minichat_ts'>[$t]</span>&nbsp;<span class='minichat_nick'>&lt;" . ($row['nick'] === null ? '' : $row['nick']) . "&gt;</span> <span class='minichat_msg'>" . htmlentities($row['msg'], ENT_QUOTES, 'UTF-8') . "</span><br>" . $msgtotal;
>>   }
>> - $msgtotal = str_replace(":-D", "<img border='0' src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":D", "<img border='0' src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":-/", "<img border='0' src='img/smiles/icon_confused.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace("8-)", "<img border='0' src='img/smiles/icon_cool.gif' width='19' height='25'>", $msgtotal);
>> - $msgtotal = str_replace("8)", "<img border='0' src='img/smiles/icon_cool.gif' width='19' height='25'>", $msgtotal);
>> - $msgtotal = str_replace(":-)", "<img border='0' src='img/smiles/icon_smile.gif' width='16' height='16'>", $msgtotal);
>> - $msgtotal = str_replace(":)", "<img border='0' src='img/smiles/icon_smile.gif' width='16' height='16'>", $msgtotal);
>> - $msgtotal = str_replace(":-(", "<img border='0' src='img/smiles/icon_sad.gif' width='40' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":(", "<img border='0' src='img/smiles/icon_sad.gif' width='40' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":-|", "<img border='0' src='img/smiles/icon_neutral.gif' width='40' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":|", "<img border='0' src='img/smiles/icon_neutral.gif' width='40' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":-p", "<img border='0' src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":p", "<img border='0' src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":-o", "<img border='0' src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(":o", "<img border='0' src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(";-)", "<img border='0' src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>> - $msgtotal = str_replace(";)", "<img border='0' src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-D", "<img src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":D", "<img src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-/", "<img src='img/smiles/icon_confused.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace("8-)", "<img src='img/smiles/icon_cool.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace("8)", "<img src='img/smiles/icon_cool.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-)", "<img src='img/smiles/icon_smile.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":)", "<img src='img/smiles/icon_smile.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-(", "<img src='img/smiles/icon_sad.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":(", "<img src='img/smiles/icon_sad.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-|", "<img src='img/smiles/icon_neutral.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":|", "<img src='img/smiles/icon_neutral.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-p", "<img src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":p", "<img src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":-o", "<img src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(":o", "<img src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(";-)", "<img src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>> + $msgtotal = str_replace(";)", "<img src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>>   echo "document.getElementById('minichatdiv_'+minichat_getchanid('$channel')).innerHTML=\"$msgtotal\";\n";
>>   echo "document.getElementById('minichat').scrollTop=99999;\n";
>>   }
>>
>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>>
>>
>> ------------------------------------------------------------------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> _______________________________________________
>> Tikiwiki-cvs mailing list
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> TikiWiki-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
TikiWiki-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
Reply | Threaded
Open this post in threaded view
|

Re: [Tiki-devel] [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[61682] branches/15.x

Jonny Bradley-4

Ok, done in r61685 but we won't really know if it's worked until we're merging back into 17.x - probably ;)

No idea why all these individual files have merge info on them in 15.x, i guess svn just does that to keep a record of which commits have already been merged and so are not needed again?

HTH

jonny




> On 14 Mar 2017, at 14:04, Jonny Bradley <[hidden email]> wrote:
>
> Hi Luci
>
> I don't think you did anything wrong, it's all a bit of a mystery to everyone i think (unless you know better?)
>
> I have been meaning to remove some of the obsolete merge info from dead branches from ages ago but we always seem to be semi-auto-merging, but not now... so here goes - deep breath!
>
> jb
>
>
>
>> On 14 Mar 2017, at 12:46, luciash <[hidden email]> wrote:
>>
>> Hey fellow devs,
>>
>> any idea why it does those property svn:mergeinfo changes on seemingly
>> irrelevant files and dirs?
>>
>> I have used the recommended svn merge command for these backports as
>> shown here: https://dev.tiki.org/Merge+a+commit+from+trunk
>>
>> Am I doing anything wrong?
>>
>> luci
>>
>>
>> On 14.3.2017 13:40, [hidden email] wrote:
>>> Revision: 61682
>>>          http://sourceforge.net/p/tikiwiki/code/61682
>>> Author:   luciash
>>> Date:     2017-03-14 12:40:31 +0000 (Tue, 14 Mar 2017)
>>> Log Message:
>>> -----------
>>> [bp/r61608][REF][FIX] minichat: more of Bootstrapification, code optimalization, fixed smiley sizes (thanks marclaporte)
>>>
>>> Modified Paths:
>>> --------------
>>>    branches/15.x/templates/modules/mod-minichat.tpl
>>>    branches/15.x/tiki-minichat_ajax.php
>>>
>>> Property Changed:
>>> ----------------
>>>    branches/15.x/
>>>    branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>>>    branches/15.x/lib/mail/maillib.php
>>>    branches/15.x/lib/setup/events.php
>>>    branches/15.x/lib/setup/prefs.php
>>>    branches/15.x/lib/tikilib.php
>>>    branches/15.x/lib/userslib.php
>>>    branches/15.x/templates/
>>>    branches/15.x/tiki-index.php
>>>
>>> Index: branches/15.x
>>> ===================================================================
>>> --- branches/15.x 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -25,4 +25,4 ##
>>> /branches/experimental/xajax_removal:31497
>>> /branches/experimental/zf1-to-zf2:56612-56811
>>> /branches/proposals/4.x:24005
>>> -/trunk:57426,57453,57455,57470,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59046-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59222,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288-59289,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59395-59398,59401,59403-59404,59408,59410,59413,59417,59423,59431-59432,59435,59437,59439-59440,59447,59449,59453,59455,59457-59458,59460,59463-59464,59468,59472,59477,59482,59484-59485,59488,59490,59492,59496,59498,59500,59502,59506,59508,59510,59520,59522,59524,59526,59529,59535,59537,59539,59544,59546,59554-59555,59560-59562,59564,59578,59580,59589,59593,59603,59605-59606,59610,59614,59616,59619,59622-59623,59627,59630,59653,59657,59659,59676,59682-59683,59686,59688-59690,59698,59707,597
> 2
>> 1,59734-59735,59746,59748-59750,59752,59762,59766,59769,59780,59810,59817,59828,59830-59831,59835,59848,59852-59853,59868,59878,59980,60013,60048,60060,60080,60082,60244,60274,60360,60364,60371-60373,60384-60385,60414-60415,60422,61283,61526,61601
>>> \ No newline at end of property
>>> +/trunk:57426,57453,57455,57470,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59046-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59222,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288-59289,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59395-59398,59401,59403-59404,59408,59410,59413,59417,59423,59431-59432,59435,59437,59439-59440,59447,59449,59453,59455,59457-59458,59460,59463-59464,59468,59472,59477,59482,59484-59485,59488,59490,59492,59496,59498,59500,59502,59506,59508,59510,59520,59522,59524,59526,59529,59535,59537,59539,59544,59546,59554-59555,59560-59562,59564,59578,59580,59589,59593,59603,59605-59606,59610,59614,59616,59619,59622-59623,59627,59630,59653,59657,59659,59676,59682-59683,59686,59688-59690,59698,59707,597
> 2
>> 1,59734-59735,59746,59748-59750,59752,59762,59766,59769,59780,59810,59817,59828,59830-59831,59835,59848,59852-59853,59868,59878,59980,60013,60048,60060,60080,60082,60244,60274,60360,60364,60371-60373,60384-60385,60414-60415,60422,61283,61526,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>>> ===================================================================
>>> --- branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/lib/core/Tiki/Command/AddonUpgradeCommand.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -24,4 +24,4 ##
>>> /branches/experimental/xajax_removal/lib/core/Tiki/Command/AddonUpgradeCommand.php:31497
>>> /branches/experimental/zf1-to-zf2/lib/core/Tiki/Command/AddonUpgradeCommand.php:56612-56811
>>> /branches/proposals/4.x/lib/core/Tiki/Command/AddonUpgradeCommand.php:24005
>>> -/trunk/lib/core/Tiki/Command/AddonUpgradeCommand.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59380,61601
>>> \ No newline at end of property
>>> +/trunk/lib/core/Tiki/Command/AddonUpgradeCommand.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59380,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/lib/mail/maillib.php
>>> ===================================================================
>>> --- branches/15.x/lib/mail/maillib.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/lib/mail/maillib.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/lib/mail/maillib.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -24,4 +24,4 ##
>>> /branches/experimental/xajax_removal/lib/mail/maillib.php:31497
>>> /branches/experimental/zf1-to-zf2/lib/mail/maillib.php:56612-56811
>>> /branches/proposals/4.x/lib/mail/maillib.php:24005
>>> -/trunk/lib/mail/maillib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58991,61601
>>> \ No newline at end of property
>>> +/trunk/lib/mail/maillib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58991,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/lib/setup/events.php
>>> ===================================================================
>>> --- branches/15.x/lib/setup/events.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/lib/setup/events.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/lib/setup/events.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -24,4 +24,4 ##
>>> /branches/experimental/xajax_removal/lib/setup/events.php:31497
>>> /branches/experimental/zf1-to-zf2/lib/setup/events.php:56612-56811
>>> /branches/proposals/4.x/lib/setup/events.php:24005
>>> -/trunk/lib/setup/events.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58908,58957,61601
>>> \ No newline at end of property
>>> +/trunk/lib/setup/events.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58908,58957,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/lib/setup/prefs.php
>>> ===================================================================
>>> --- branches/15.x/lib/setup/prefs.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/lib/setup/prefs.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/lib/setup/prefs.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -24,4 +24,4 ##
>>> /branches/experimental/xajax_removal/lib/setup/prefs.php:31497
>>> /branches/experimental/zf1-to-zf2/lib/setup/prefs.php:56612-56811
>>> /branches/proposals/4.x/lib/setup/prefs.php:24005
>>> -/trunk/lib/setup/prefs.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58963,61601
>>> \ No newline at end of property
>>> +/trunk/lib/setup/prefs.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,58062-58063,58503,58953,58963,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/lib/tikilib.php
>>> ===================================================================
>>> --- branches/15.x/lib/tikilib.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/lib/tikilib.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/lib/tikilib.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -25,4 +25,4 ##
>>> /branches/experimental/xajax_removal/lib/tikilib.php:31497
>>> /branches/experimental/zf1-to-zf2/lib/tikilib.php:56612-56811
>>> /branches/proposals/4.x/lib/tikilib.php:24005
>>> -/trunk/lib/tikilib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59388,59524,59554,59578,59868,61601
>>> \ No newline at end of property
>>> +/trunk/lib/tikilib.php:57426,57453,57455,57478,57579,57761,57816,57840,57868,57911-57912,57981,57986,58000,58005,58062-58063,58503,58953,58984-58987,58995,59008,59010,59012,59044,59047-59048,59064,59071,59075,59086,59088-59089,59121,59125,59162,59178,59180,59189,59197,59200-59201,59212,59217,59254,59258,59261,59263-59265,59267,59270,59273,59278-59279,59281-59282,59288,59291,59293-59295,59298,59300,59302-59304,59309-59310,59313,59320-59322,59325,59340-59343,59346,59359-59360,59371,59373,59377,59388,59524,59554,59578,59868,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/lib/userslib.php
>>> ===================================================================
>>> --- branches/15.x/lib/userslib.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/lib/userslib.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/lib/userslib.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -25,4 +25,4 ##
>>> /branches/experimental/xajax_removal/lib/userslib.php:31497
>>> /branches/experimental/zf1-to-zf2/lib/userslib.php:56612-56811
>>> /branches/proposals/4.x/lib/userslib.php:24005
>>> -/trunk/lib/userslib.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58957,61601
>>> \ No newline at end of property
>>> +/trunk/lib/userslib.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58957,61601,61608
>>> \ No newline at end of property
>>> Index: branches/15.x/templates
>>> ===================================================================
>>> --- branches/15.x/templates 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/templates 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/templates
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -25,4 +25,4 ##
>>> /branches/experimental/xajax_removal/templates:31497
>>> /branches/experimental/zf1-to-zf2/templates:56612-56811
>>> /branches/proposals/4.x/templates:24005
>>> -/trunk/templates:57426,57478,57911,57986,58063,58995,59010,59044,59071,59121,59162,59212,59217,59222,59261,59267,59273,59281,59293-59295,59300,59303-59304,59320-59321,59325,59340-59343,59377,59395-59398,59401,59403,59408,59410,59417,59423,59435,59458,59460,59482,59496,59498,59508,59529,59544,59546,59580,59589,59605-59606,59682,59707,59750,59769,59831,59853,59878,59980,60060,60274,60360,60384-60385,60402,61601
>>> \ No newline at end of property
>>> +/trunk/templates:57426,57478,57911,57986,58063,58995,59010,59044,59071,59121,59162,59212,59217,59222,59261,59267,59273,59281,59293-59295,59300,59303-59304,59320-59321,59325,59340-59343,59377,59395-59398,59401,59403,59408,59410,59417,59423,59435,59458,59460,59482,59496,59498,59508,59529,59544,59546,59580,59589,59605-59606,59682,59707,59750,59769,59831,59853,59878,59980,60060,60274,60360,60384-60385,60402,61601,61608
>>> \ No newline at end of property
>>> Modified: branches/15.x/templates/modules/mod-minichat.tpl
>>> ===================================================================
>>> --- branches/15.x/templates/modules/mod-minichat.tpl 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/templates/modules/mod-minichat.tpl 2017-03-14 12:40:31 UTC (rev 61682)
>>> @@ -1,15 +1,13 @@
>>> {tikimodule error=$module_params.error title=$tpl_module_title name="minichat" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
>>>
>>> - {if $module_params.nochannelbar && $module_params.nochannelbar != "n"}
>>> - <div id='minichatchans' class='minichatchans' style="height:0em;visibility:hidden"></div>
>>> - {else}
>>> - <div id='minichatchans' class='minichatchans'></div>
>>> - {/if}
>>> - <div id='minichat' class='minichat' style='overflow-x: hidden; overflow-y: scroll; width: 100%; height: {$module_rows}em;'></div>
>>> +
>>> + <div id='minichatchans' class='btn-group minichatchans margin-bottom-xs'{if $module_params.nochannelbar && $module_params.nochannelbar != "n"} style="height: 0; visibility: hidden"{/if}></div>
>>> +
>>> + <div id='minichat' class='minichat well well-sm' style='overflow-x: hidden; overflow-y: auto; height: {$module_rows}em;'></div>
>>>
>>> <div class="minichatinputs">
>>> <form class="form-horizontal" name='minichatinputform' action='javascript:minichatpost();'>
>>> - <div class="input-group">
>>> + <div class="input-group input-group-sm">
>>> <input class="form-control" name='minichatinput' id='minichatinput' type='text' autocomplete='off'>
>>> <span class="input-group-btn"><input class="btn btn-primary" type='submit' value="{tr}OK{/tr}"></span>
>>> </div>
>>> @@ -98,7 +96,7 @@
>>> d.style.display="none";
>>>
>>> d=document.getElementById('minichata_'+minichat_selectedchan.id);
>>> - d.setAttribute('class', 'btn btn-default minichata_unselected');
>>> + d.setAttribute('class', 'btn btn-default btn-xs minichata_unselected');
>>>
>>> minichat_selectedchan=null;
>>> }
>>> @@ -109,7 +107,7 @@
>>> d.style.display="";
>>>
>>> d=document.getElementById('minichata_'+c.id);
>>> - d.setAttribute('class', 'active btn btn-default minichata_selected');
>>> + d.setAttribute('class', 'active btn btn-default btn-xs minichata_selected');
>>>
>>> minichat_selectedchan=c;
>>> }
>>> @@ -129,7 +127,7 @@
>>> var d=minichat_newelem("div", { 'id' : 'minichatdiv_'+c.id , 'class' : 'minichatdiv' });
>>> document.getElementById('minichat').appendChild(d);
>>>
>>> - d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-default minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
>>> + d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-default btn-xs minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
>>> d.innerHTML=c.name;
>>> document.getElementById('minichatchans').appendChild(d);
>>>
>>>
>>> Index: branches/15.x/tiki-index.php
>>> ===================================================================
>>> --- branches/15.x/tiki-index.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/tiki-index.php 2017-03-14 12:40:31 UTC (rev 61682)
>>>
>>> Property changes on: branches/15.x/tiki-index.php
>>> ___________________________________________________________________
>>> Modified: svn:mergeinfo
>>> ## -24,4 +24,4 ##
>>> /branches/experimental/xajax_removal/tiki-index.php:31497
>>> /branches/experimental/zf1-to-zf2/tiki-index.php:56612-56811
>>> /branches/proposals/4.x/tiki-index.php:24005
>>> -/trunk/tiki-index.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58926,61601
>>> \ No newline at end of property
>>> +/trunk/tiki-index.php:57426,57478,57761,57840,57868,57911-57912,57981,58062-58063,58503,58926,61601,61608
>>> \ No newline at end of property
>>> Modified: branches/15.x/tiki-minichat_ajax.php
>>> ===================================================================
>>> --- branches/15.x/tiki-minichat_ajax.php 2017-03-14 12:34:03 UTC (rev 61681)
>>> +++ branches/15.x/tiki-minichat_ajax.php 2017-03-14 12:40:31 UTC (rev 61682)
>>> @@ -133,25 +133,26 @@
>>>                     $t = date("H:i", $row['ts']);
>>>                 }
>>>             }
>>> + //TODO: improve matching and replace with better smileys + use global lib
>>>             $msgtotal = "<span class='minichat_ts'>[$t]</span>&nbsp;<span class='minichat_nick'>&lt;" . ($row['nick'] === null ? '' : $row['nick']) . "&gt;</span> <span class='minichat_msg'>" . htmlentities($row['msg'], ENT_QUOTES, 'UTF-8') . "</span><br>" . $msgtotal;
>>> }
>>> - $msgtotal = str_replace(":-D", "<img border='0' src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":D", "<img border='0' src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":-/", "<img border='0' src='img/smiles/icon_confused.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace("8-)", "<img border='0' src='img/smiles/icon_cool.gif' width='19' height='25'>", $msgtotal);
>>> - $msgtotal = str_replace("8)", "<img border='0' src='img/smiles/icon_cool.gif' width='19' height='25'>", $msgtotal);
>>> - $msgtotal = str_replace(":-)", "<img border='0' src='img/smiles/icon_smile.gif' width='16' height='16'>", $msgtotal);
>>> - $msgtotal = str_replace(":)", "<img border='0' src='img/smiles/icon_smile.gif' width='16' height='16'>", $msgtotal);
>>> - $msgtotal = str_replace(":-(", "<img border='0' src='img/smiles/icon_sad.gif' width='40' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":(", "<img border='0' src='img/smiles/icon_sad.gif' width='40' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":-|", "<img border='0' src='img/smiles/icon_neutral.gif' width='40' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":|", "<img border='0' src='img/smiles/icon_neutral.gif' width='40' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":-p", "<img border='0' src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":p", "<img border='0' src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":-o", "<img border='0' src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(":o", "<img border='0' src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(";-)", "<img border='0' src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>>> - $msgtotal = str_replace(";)", "<img border='0' src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-D", "<img src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":D", "<img src='img/smiles/icon_biggrin.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-/", "<img src='img/smiles/icon_confused.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace("8-)", "<img src='img/smiles/icon_cool.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace("8)", "<img src='img/smiles/icon_cool.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-)", "<img src='img/smiles/icon_smile.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":)", "<img src='img/smiles/icon_smile.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-(", "<img src='img/smiles/icon_sad.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":(", "<img src='img/smiles/icon_sad.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-|", "<img src='img/smiles/icon_neutral.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":|", "<img src='img/smiles/icon_neutral.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-p", "<img src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":p", "<img src='img/smiles/icon_razz.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":-o", "<img src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(":o", "<img src='img/smiles/icon_surprised.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(";-)", "<img src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>>> + $msgtotal = str_replace(";)", "<img src='img/smiles/icon_wink.gif' width='15' height='15'>", $msgtotal);
>>> echo "document.getElementById('minichatdiv_'+minichat_getchanid('$channel')).innerHTML=\"$msgtotal\";\n";
>>> echo "document.getElementById('minichat').scrollTop=99999;\n";
>>> }
>>>
>>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> Check out the vibrant tech community on one of the world's most
>>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>>> _______________________________________________
>>> Tikiwiki-cvs mailing list
>>> [hidden email]
>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>>
>>
>>
>> ------------------------------------------------------------------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> _______________________________________________
>> TikiWiki-devel mailing list
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>>
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> TikiWiki-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
TikiWiki-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel