aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2014-12-30 16:16:57 -0600
committerAndrew Manning <tamanning@zoho.com>2014-12-30 16:16:57 -0600
commitc49b5218846e67e55a5aa4362d3ed0fc548d6628 (patch)
tree789859890537530315b722456f438a64301e223d
parentb78a545a1056e6db9f4b6b4f262182b0a5c56e67 (diff)
downloadvolse-hubzilla-c49b5218846e67e55a5aa4362d3ed0fc548d6628.tar.gz
volse-hubzilla-c49b5218846e67e55a5aa4362d3ed0fc548d6628.tar.bz2
volse-hubzilla-c49b5218846e67e55a5aa4362d3ed0fc548d6628.zip
Added url tag around image for inserted links
-rw-r--r--doc/html/classRedmatrix_1_1Import_1_1Import-members.html36
-rw-r--r--doc/html/classRedmatrix_1_1Import_1_1Import.html190
-rw-r--r--doc/html/classRedmatrix_1_1Import_1_1Import.js32
-rw-r--r--doc/html/namespaceRedmatrix_1_1Import.html8
-rw-r--r--doc/html/namespaceRedmatrix_1_1Import.js4
-rw-r--r--mod/parse_url.php9
6 files changed, 163 insertions, 116 deletions
diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import-members.html b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html
index 061fc11a4..2be66a2ea 100644
--- a/doc/html/classRedmatrix_1_1Import_1_1Import-members.html
+++ b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html
@@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</div>
</div>
<script type="text/javascript">
-$(document).ready(function(){initNavTree('classRedmatrix_1_1Import_1_1Import.html','');});
+$(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.html','');});
</script>
<div id="doc-content">
<!-- window showing the filter options -->
@@ -106,27 +106,27 @@ $(document).ready(function(){initNavTree('classRedmatrix_1_1Import_1_1Import.htm
<div class="header">
<div class="headertitle">
-<div class="title">Redmatrix\Import\Import Member List</div> </div>
+<div class="title">RedMatrix\Import\Import Member List</div> </div>
</div><!--header-->
<div class="contents">
-<p>This is the complete list of members for <a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a>, including all inherited members.</p>
+<p>This is the complete list of members for <a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a>, including all inherited members.</p>
<table class="directory">
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1">$credentials</a></td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a2f69f16ecb7de1fb1daffbc38e68c9f1">$itemlist</a></td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a31d73d48e1aa93319159c692d0197a3a">$items</a></td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ac578e85e4c491bf9e09fbbfa33f9d6b7">$src_items</a></td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ad9c6677ea07c496d81914b97aeb5fba5">convert_child</a>($child)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#add4d39232c883b59634595be14441336">convert_item</a>($item_ident)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a5a54b41c30aed8ac9ca6e486fd0b4b97">convert_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580">get_children</a>($item_ident)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a76dd522e47a48d80e1678211230f2ff5">get_credentials</a>()</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ae705dd1deb245b1d06baa73062330e43">get_item</a>($item_ident)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a4420d6acf6ba2f3723c655251b12abef">get_item_ident</a>($item)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a1af46c9f88257635f362d6027ea710c3">get_itemlist</a>()</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ab1e4a1d404b5a5a9c518c205d1428154">get_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">run</a>()</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
- <tr class="even"><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a70f9dd767d877530a7da7c6bd821e080">store</a>($item, $update=false)</td><td class="entry"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Redmatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f">$credentials</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">private</span></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc">$itemlist</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c">$items</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6">$src_items</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a">convert_child</a>($child)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218">convert_item</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6">convert_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8">get_children</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">get_credentials</a>()</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2">get_item</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059">get_item_ident</a>($item)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">get_itemlist</a>()</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c">get_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">run</a>()</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc">store</a>($item, $update=false)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr>
</table></div><!-- contents -->
</div><!-- doc-content -->
diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.html b/doc/html/classRedmatrix_1_1Import_1_1Import.html
index 6eec161c2..2119780c3 100644
--- a/doc/html/classRedmatrix_1_1Import_1_1Import.html
+++ b/doc/html/classRedmatrix_1_1Import_1_1Import.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.3.1"/>
-<title>The Red Matrix: Redmatrix\Import\Import Class Reference</title>
+<title>The Red Matrix: RedMatrix\Import\Import Class Reference</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
@@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</div>
</div>
<script type="text/javascript">
-$(document).ready(function(){initNavTree('classRedmatrix_1_1Import_1_1Import.html','');});
+$(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.html','');});
</script>
<div id="doc-content">
<!-- window showing the filter options -->
@@ -107,56 +107,60 @@ $(document).ready(function(){initNavTree('classRedmatrix_1_1Import_1_1Import.htm
<div class="header">
<div class="summary">
<a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="#pub-attribs">Public Attributes</a> &#124;
-<a href="classRedmatrix_1_1Import_1_1Import-members.html">List of all members</a> </div>
+<a href="#pro-attribs">Protected Attributes</a> &#124;
+<a href="#pri-attribs">Private Attributes</a> &#124;
+<a href="classRedMatrix_1_1Import_1_1Import-members.html">List of all members</a> </div>
<div class="headertitle">
-<div class="title">Redmatrix\Import\Import Class Reference</div> </div>
+<div class="title">RedMatrix\Import\Import Class Reference</div> </div>
</div><!--header-->
<div class="contents">
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
Public Member Functions</h2></td></tr>
-<tr class="memitem:a76dd522e47a48d80e1678211230f2ff5"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a76dd522e47a48d80e1678211230f2ff5">get_credentials</a> ()</td></tr>
-<tr class="separator:a76dd522e47a48d80e1678211230f2ff5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a1af46c9f88257635f362d6027ea710c3"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a1af46c9f88257635f362d6027ea710c3">get_itemlist</a> ()</td></tr>
-<tr class="separator:a1af46c9f88257635f362d6027ea710c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a4420d6acf6ba2f3723c655251b12abef"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a4420d6acf6ba2f3723c655251b12abef">get_item_ident</a> ($item)</td></tr>
-<tr class="separator:a4420d6acf6ba2f3723c655251b12abef"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae705dd1deb245b1d06baa73062330e43"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ae705dd1deb245b1d06baa73062330e43">get_item</a> ($item_ident)</td></tr>
-<tr class="separator:ae705dd1deb245b1d06baa73062330e43"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab1e4a1d404b5a5a9c518c205d1428154"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ab1e4a1d404b5a5a9c518c205d1428154">get_taxonomy</a> ($item_ident)</td></tr>
-<tr class="separator:ab1e4a1d404b5a5a9c518c205d1428154"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a832a4cc0d33d0eea29cb450004054580"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580">get_children</a> ($item_ident)</td></tr>
-<tr class="separator:a832a4cc0d33d0eea29cb450004054580"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:add4d39232c883b59634595be14441336"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#add4d39232c883b59634595be14441336">convert_item</a> ($item_ident)</td></tr>
-<tr class="separator:add4d39232c883b59634595be14441336"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a5a54b41c30aed8ac9ca6e486fd0b4b97"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a5a54b41c30aed8ac9ca6e486fd0b4b97">convert_taxonomy</a> ($item_ident)</td></tr>
-<tr class="separator:a5a54b41c30aed8ac9ca6e486fd0b4b97"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad9c6677ea07c496d81914b97aeb5fba5"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ad9c6677ea07c496d81914b97aeb5fba5">convert_child</a> ($child)</td></tr>
-<tr class="separator:ad9c6677ea07c496d81914b97aeb5fba5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a70f9dd767d877530a7da7c6bd821e080"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a70f9dd767d877530a7da7c6bd821e080">store</a> ($item, $update=false)</td></tr>
-<tr class="separator:a70f9dd767d877530a7da7c6bd821e080"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af432ecbc45b812a03d58dfb378a212f7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">run</a> ()</td></tr>
-<tr class="separator:af432ecbc45b812a03d58dfb378a212f7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a24134929d9a8a682da2036a0bf326367"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">get_credentials</a> ()</td></tr>
+<tr class="separator:a24134929d9a8a682da2036a0bf326367"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a855cd5a79b95d269ae8737fae774e3bc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">get_itemlist</a> ()</td></tr>
+<tr class="separator:a855cd5a79b95d269ae8737fae774e3bc"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a772c28edf36aaf8e66007a95004c4059"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059">get_item_ident</a> ($item)</td></tr>
+<tr class="separator:a772c28edf36aaf8e66007a95004c4059"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a27987a41cb703a796f1821baeb4774a2"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2">get_item</a> ($item_ident)</td></tr>
+<tr class="separator:a27987a41cb703a796f1821baeb4774a2"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae3c6472bea1a44025bc2e152604eb20c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c">get_taxonomy</a> ($item_ident)</td></tr>
+<tr class="separator:ae3c6472bea1a44025bc2e152604eb20c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a57561904b0f127e0d9a3e2c33688daf8"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8">get_children</a> ($item_ident)</td></tr>
+<tr class="separator:a57561904b0f127e0d9a3e2c33688daf8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a107703a43a1b0ceb2af7ae470cb3f218"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218">convert_item</a> ($item_ident)</td></tr>
+<tr class="separator:a107703a43a1b0ceb2af7ae470cb3f218"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:addf6e53dacd971eaab49be4b17a767d6"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6">convert_taxonomy</a> ($item_ident)</td></tr>
+<tr class="separator:addf6e53dacd971eaab49be4b17a767d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5434325afb2c633c52540127d717800a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a">convert_child</a> ($child)</td></tr>
+<tr class="separator:a5434325afb2c633c52540127d717800a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a33ed595de044c0ec1cd84cca719e31dc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc">store</a> ($item, $update=false)</td></tr>
+<tr class="separator:a33ed595de044c0ec1cd84cca719e31dc"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a8d138a9a7d4f79b81d3446ca216a602c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">run</a> ()</td></tr>
+<tr class="separator:a8d138a9a7d4f79b81d3446ca216a602c"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-attribs"></a>
-Public Attributes</h2></td></tr>
-<tr class="memitem:afd251e6e5a18516bac4d1a40435602f1"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1">$credentials</a> = null</td></tr>
-<tr class="separator:afd251e6e5a18516bac4d1a40435602f1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a2f69f16ecb7de1fb1daffbc38e68c9f1"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a2f69f16ecb7de1fb1daffbc38e68c9f1">$itemlist</a> = null</td></tr>
-<tr class="separator:a2f69f16ecb7de1fb1daffbc38e68c9f1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac578e85e4c491bf9e09fbbfa33f9d6b7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ac578e85e4c491bf9e09fbbfa33f9d6b7">$src_items</a> = null</td></tr>
-<tr class="separator:ac578e85e4c491bf9e09fbbfa33f9d6b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a31d73d48e1aa93319159c692d0197a3a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a31d73d48e1aa93319159c692d0197a3a">$items</a> = null</td></tr>
-<tr class="separator:a31d73d48e1aa93319159c692d0197a3a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pro-attribs"></a>
+Protected Attributes</h2></td></tr>
+<tr class="memitem:ad0d2bdc3b388220479063915b4f5c2fc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc">$itemlist</a> = null</td></tr>
+<tr class="separator:ad0d2bdc3b388220479063915b4f5c2fc"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a88c2eeba8d0cba3e7c12a2c45ba0fbc6"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6">$src_items</a> = null</td></tr>
+<tr class="separator:a88c2eeba8d0cba3e7c12a2c45ba0fbc6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0a05dac405ccc5b617b7b7b3c8ed783c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c">$items</a> = null</td></tr>
+<tr class="separator:a0a05dac405ccc5b617b7b7b3c8ed783c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pri-attribs"></a>
+Private Attributes</h2></td></tr>
+<tr class="memitem:a864aac9fadb4846f5d9f840e8e0f440f"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f">$credentials</a> = null</td></tr>
+<tr class="separator:a864aac9fadb4846f5d9f840e8e0f440f"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<h2 class="groupheader">Member Function Documentation</h2>
-<a class="anchor" id="ad9c6677ea07c496d81914b97aeb5fba5"></a>
+<a class="anchor" id="a5434325afb2c633c52540127d717800a"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::convert_child </td>
+ <td class="memname">RedMatrix\Import\Import::convert_child </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$child</em></td><td>)</td>
@@ -165,16 +169,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="add4d39232c883b59634595be14441336"></a>
+<a class="anchor" id="a107703a43a1b0ceb2af7ae470cb3f218"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::convert_item </td>
+ <td class="memname">RedMatrix\Import\Import::convert_item </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item_ident</em></td><td>)</td>
@@ -183,16 +187,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="a5a54b41c30aed8ac9ca6e486fd0b4b97"></a>
+<a class="anchor" id="addf6e53dacd971eaab49be4b17a767d6"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::convert_taxonomy </td>
+ <td class="memname">RedMatrix\Import\Import::convert_taxonomy </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item_ident</em></td><td>)</td>
@@ -201,16 +205,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="a832a4cc0d33d0eea29cb450004054580"></a>
+<a class="anchor" id="a57561904b0f127e0d9a3e2c33688daf8"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::get_children </td>
+ <td class="memname">RedMatrix\Import\Import::get_children </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item_ident</em></td><td>)</td>
@@ -219,16 +223,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="a76dd522e47a48d80e1678211230f2ff5"></a>
+<a class="anchor" id="a24134929d9a8a682da2036a0bf326367"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::get_credentials </td>
+ <td class="memname">RedMatrix\Import\Import::get_credentials </td>
<td>(</td>
<td class="paramname"></td><td>)</td>
<td></td>
@@ -236,16 +240,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="ae705dd1deb245b1d06baa73062330e43"></a>
+<a class="anchor" id="a27987a41cb703a796f1821baeb4774a2"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::get_item </td>
+ <td class="memname">RedMatrix\Import\Import::get_item </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item_ident</em></td><td>)</td>
@@ -254,16 +258,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="a4420d6acf6ba2f3723c655251b12abef"></a>
+<a class="anchor" id="a772c28edf36aaf8e66007a95004c4059"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::get_item_ident </td>
+ <td class="memname">RedMatrix\Import\Import::get_item_ident </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item</em></td><td>)</td>
@@ -274,12 +278,12 @@ Public Attributes</h2></td></tr>
</div>
</div>
-<a class="anchor" id="a1af46c9f88257635f362d6027ea710c3"></a>
+<a class="anchor" id="a855cd5a79b95d269ae8737fae774e3bc"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::get_itemlist </td>
+ <td class="memname">RedMatrix\Import\Import::get_itemlist </td>
<td>(</td>
<td class="paramname"></td><td>)</td>
<td></td>
@@ -287,16 +291,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="ab1e4a1d404b5a5a9c518c205d1428154"></a>
+<a class="anchor" id="ae3c6472bea1a44025bc2e152604eb20c"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::get_taxonomy </td>
+ <td class="memname">RedMatrix\Import\Import::get_taxonomy </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item_ident</em></td><td>)</td>
@@ -305,16 +309,16 @@ Public Attributes</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7">Redmatrix\Import\Import\run()</a>.</p>
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p>
</div>
</div>
-<a class="anchor" id="af432ecbc45b812a03d58dfb378a212f7"></a>
+<a class="anchor" id="a8d138a9a7d4f79b81d3446ca216a602c"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::run </td>
+ <td class="memname">RedMatrix\Import\Import::run </td>
<td>(</td>
<td class="paramname"></td><td>)</td>
<td></td>
@@ -324,12 +328,12 @@ Public Attributes</h2></td></tr>
</div>
</div>
-<a class="anchor" id="a70f9dd767d877530a7da7c6bd821e080"></a>
+<a class="anchor" id="a33ed595de044c0ec1cd84cca719e31dc"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::store </td>
+ <td class="memname">RedMatrix\Import\Import::store </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>$item</em>, </td>
@@ -351,50 +355,86 @@ Public Attributes</h2></td></tr>
</div>
</div>
<h2 class="groupheader">Member Data Documentation</h2>
-<a class="anchor" id="afd251e6e5a18516bac4d1a40435602f1"></a>
+<a class="anchor" id="a864aac9fadb4846f5d9f840e8e0f440f"></a>
<div class="memitem">
<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::$credentials = null</td>
+ <td class="memname">RedMatrix\Import\Import::$credentials = null</td>
</tr>
</table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">private</span></span> </td>
+ </tr>
+</table>
</div><div class="memdoc">
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">RedMatrix\Import\Import\get_credentials()</a>.</p>
+
</div>
</div>
-<a class="anchor" id="a2f69f16ecb7de1fb1daffbc38e68c9f1"></a>
+<a class="anchor" id="ad0d2bdc3b388220479063915b4f5c2fc"></a>
<div class="memitem">
<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::$itemlist = null</td>
+ <td class="memname">RedMatrix\Import\Import::$itemlist = null</td>
</tr>
</table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">protected</span></span> </td>
+ </tr>
+</table>
</div><div class="memdoc">
+<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">RedMatrix\Import\Import\get_itemlist()</a>.</p>
+
</div>
</div>
-<a class="anchor" id="a31d73d48e1aa93319159c692d0197a3a"></a>
+<a class="anchor" id="a0a05dac405ccc5b617b7b7b3c8ed783c"></a>
<div class="memitem">
<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::$items = null</td>
+ <td class="memname">RedMatrix\Import\Import::$items = null</td>
</tr>
</table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">protected</span></span> </td>
+ </tr>
+</table>
</div><div class="memdoc">
</div>
</div>
-<a class="anchor" id="ac578e85e4c491bf9e09fbbfa33f9d6b7"></a>
+<a class="anchor" id="a88c2eeba8d0cba3e7c12a2c45ba0fbc6"></a>
<div class="memitem">
<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
<table class="memname">
<tr>
- <td class="memname">Redmatrix\Import\Import::$src_items = null</td>
+ <td class="memname">RedMatrix\Import\Import::$src_items = null</td>
</tr>
</table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">protected</span></span> </td>
+ </tr>
+</table>
</div><div class="memdoc">
</div>
diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js
index 2a0e2eef0..03e429289 100644
--- a/doc/html/classRedmatrix_1_1Import_1_1Import.js
+++ b/doc/html/classRedmatrix_1_1Import_1_1Import.js
@@ -1,18 +1,18 @@
-var classRedmatrix_1_1Import_1_1Import =
+var classRedMatrix_1_1Import_1_1Import =
[
- [ "convert_child", "classRedmatrix_1_1Import_1_1Import.html#ad9c6677ea07c496d81914b97aeb5fba5", null ],
- [ "convert_item", "classRedmatrix_1_1Import_1_1Import.html#add4d39232c883b59634595be14441336", null ],
- [ "convert_taxonomy", "classRedmatrix_1_1Import_1_1Import.html#a5a54b41c30aed8ac9ca6e486fd0b4b97", null ],
- [ "get_children", "classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580", null ],
- [ "get_credentials", "classRedmatrix_1_1Import_1_1Import.html#a76dd522e47a48d80e1678211230f2ff5", null ],
- [ "get_item", "classRedmatrix_1_1Import_1_1Import.html#ae705dd1deb245b1d06baa73062330e43", null ],
- [ "get_item_ident", "classRedmatrix_1_1Import_1_1Import.html#a4420d6acf6ba2f3723c655251b12abef", null ],
- [ "get_itemlist", "classRedmatrix_1_1Import_1_1Import.html#a1af46c9f88257635f362d6027ea710c3", null ],
- [ "get_taxonomy", "classRedmatrix_1_1Import_1_1Import.html#ab1e4a1d404b5a5a9c518c205d1428154", null ],
- [ "run", "classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7", null ],
- [ "store", "classRedmatrix_1_1Import_1_1Import.html#a70f9dd767d877530a7da7c6bd821e080", null ],
- [ "$credentials", "classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1", null ],
- [ "$itemlist", "classRedmatrix_1_1Import_1_1Import.html#a2f69f16ecb7de1fb1daffbc38e68c9f1", null ],
- [ "$items", "classRedmatrix_1_1Import_1_1Import.html#a31d73d48e1aa93319159c692d0197a3a", null ],
- [ "$src_items", "classRedmatrix_1_1Import_1_1Import.html#ac578e85e4c491bf9e09fbbfa33f9d6b7", null ]
+ [ "convert_child", "classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a", null ],
+ [ "convert_item", "classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218", null ],
+ [ "convert_taxonomy", "classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6", null ],
+ [ "get_children", "classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8", null ],
+ [ "get_credentials", "classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367", null ],
+ [ "get_item", "classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2", null ],
+ [ "get_item_ident", "classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059", null ],
+ [ "get_itemlist", "classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc", null ],
+ [ "get_taxonomy", "classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c", null ],
+ [ "run", "classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c", null ],
+ [ "store", "classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc", null ],
+ [ "$credentials", "classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f", null ],
+ [ "$itemlist", "classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc", null ],
+ [ "$items", "classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c", null ],
+ [ "$src_items", "classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6", null ]
]; \ No newline at end of file
diff --git a/doc/html/namespaceRedmatrix_1_1Import.html b/doc/html/namespaceRedmatrix_1_1Import.html
index b21ffdff2..a0ab85227 100644
--- a/doc/html/namespaceRedmatrix_1_1Import.html
+++ b/doc/html/namespaceRedmatrix_1_1Import.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.3.1"/>
-<title>The Red Matrix: Redmatrix\Import Namespace Reference</title>
+<title>The Red Matrix: RedMatrix\Import Namespace Reference</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
@@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
</div>
</div>
<script type="text/javascript">
-$(document).ready(function(){initNavTree('namespaceRedmatrix_1_1Import.html','');});
+$(document).ready(function(){initNavTree('namespaceRedMatrix_1_1Import.html','');});
</script>
<div id="doc-content">
<!-- window showing the filter options -->
@@ -106,13 +106,13 @@ $(document).ready(function(){initNavTree('namespaceRedmatrix_1_1Import.html','')
<div class="summary">
<a href="#nested-classes">Classes</a> </div>
<div class="headertitle">
-<div class="title">Redmatrix\Import Namespace Reference</div> </div>
+<div class="title">RedMatrix\Import Namespace Reference</div> </div>
</div><!--header-->
<div class="contents">
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
Classes</h2></td></tr>
-<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Import</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">Import</a></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
</div><!-- contents -->
diff --git a/doc/html/namespaceRedmatrix_1_1Import.js b/doc/html/namespaceRedmatrix_1_1Import.js
index 74692ac3b..c26a05140 100644
--- a/doc/html/namespaceRedmatrix_1_1Import.js
+++ b/doc/html/namespaceRedmatrix_1_1Import.js
@@ -1,4 +1,4 @@
-var namespaceRedmatrix_1_1Import =
+var namespaceRedMatrix_1_1Import =
[
- [ "Import", "classRedmatrix_1_1Import_1_1Import.html", "classRedmatrix_1_1Import_1_1Import" ]
+ [ "Import", "classRedMatrix_1_1Import_1_1Import.html", "classRedMatrix_1_1Import_1_1Import" ]
]; \ No newline at end of file
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 340e1a67e..23d608411 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -307,7 +307,14 @@ function parse_url_content(&$a) {
$max_images = intval($max_images);
foreach ($siteinfo["images"] as $imagedata) {
- $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n";
+ if ($url) {
+ $image .= sprintf('[url=%s]', $url);
+ }
+ $image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]';
+ if ($url) {
+ $image .= '[/url]';
+ }
+ $image .= "\n";
$total_images ++;
if($max_images && $max_images >= $total_images)
break;